Not attempting to fix packaging branch ancestry, missing pristine tar data for version 0.4.8+16.10.20160730. M src/modules/Unity/Application/mirsurface.cpp Text conflict in src/modules/Unity/Application/mirsurface.cpp 1 conflicts encountered.
« Back to merge proposal
Not attempting to fix packaging branch ancestry, missing pristine tar data for version 0.4.8+16. 10.20160730. Unity/Applicati on/mirsurface. cpp Unity/Applicati on/mirsurface. cpp
M src/modules/
Text conflict in src/modules/
1 conflicts encountered.