5106604 · unity8 · git.iko.soy

on xenial help sign in

fix bad merge

5106604Michael Zanetti12 years ago

debian/control−4

@@ -169,12 +169,8 @@ Pre-Depends: ${misc:Pre-Depends},

169Depends: ${misc:Depends},

170 ${shlibs:Depends},

171Provides: unity-application-impl,

172−<<<<<<< TREE

173 unity-application-impl-6,

172 unity-application-impl-6,

174−=======

175− unity-application-impl-4,

176Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1)

173Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1)

177−>>>>>>> MERGE-SOURCE

178Description: Fake environment for running Unity 8 shell

174Description: Fake environment for running Unity 8 shell

179 Provides fake implementations of some QML modules used by Unity 8 shell

175 Provides fake implementations of some QML modules used by Unity 8 shell

180 (e.g Ubuntu.Application) so that you can run it in a sandboxed environment.

176 (e.g Ubuntu.Application) so that you can run it in a sandboxed environment.