Doesn't merge correctly
Text conflict in debian/changelog Text conflict in src/modules/Unity/Application/application_manager.cpp Text conflict in src/modules/Unity/Application/application_manager.h 3 conflicts encountered.
« Back to merge proposal
Doesn't merge correctly
Text conflict in debian/changelog Unity/Applicati on/application_ manager. cpp Unity/Applicati on/application_ manager. h
Text conflict in src/modules/
Text conflict in src/modules/
3 conflicts encountered.