@@ -169,12 +169,8 @@ Pre-Depends: ${misc:Pre-Depends},
169169Depends: ${misc:Depends},
170170 ${shlibs:Depends},
171171Provides: unity-application-impl,
172−<<<<<<< TREE
173172 unity-application-impl-6,
174−=======
175− unity-application-impl-4,
176173Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1)
177−>>>>>>> MERGE-SOURCE
178174Description: Fake environment for running Unity 8 shell
179175 Provides fake implementations of some QML modules used by Unity 8 shell
180176 (e.g Ubuntu.Application) so that you can run it in a sandboxed environment.