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