Hey On Wed, Dec 9, 2015 at 6:08 PM, Jonathan Riddell <[email protected]> wrote: > forwarding from irc because sgclark is away this week > > > <bshah> sgclark: your recent commit to kdeplasma-addons added git markers > <bshah> (debian packaging) > <bshah> bshah@archbox ..ea-tooling/git/plasma/kdeplasma-addons > (git)-[kubuntu_unstable] % git grep HEAD > <bshah> debian/control:<<<<<<< HEAD > <bshah> debian/plasma-widgets-addons.install:<<<<<<< HEAD
Should be fixed now. Cheers Rohan Garg -- kubuntu-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
