Attempt to merge into lp:unity failed due to conflicts:
text conflict in shortcuts/StandaloneShortcuts.cpp
« Back to merge proposal
Attempt to merge into lp:unity failed due to conflicts:
text conflict in shortcuts/ StandaloneShort cuts.cpp