[Merge] lp:~noskcaj/ubuntu/wily/light-locker/merge into lp:ubuntu/light-locker

[Daniel Holbach]

Review: Needs Fixing

daniel at daydream:~/light-locker$ bzr merge lp:~noskcaj/ubuntu/wily/light-locker/merge
Warning: criss-cross merge encountered.  See bzr help criss-cross.                                                                                    
Unapplying quilt patches to prevent spurious conflicts                                                                                                
 M  debian/changelog                                                                                                                                  
 M  debian/control
Text conflict in debian/changelog
Text conflict in debian/control
Auf 2 Konflikte gestoßen.                                                                                                                             
daniel at daydream:~/light-locker$ 

-- 
https://code.launchpad.net/~noskcaj/ubuntu/wily/light-locker/merge/+merge/265880
Your team Ubuntu branches is subscribed to branch lp:ubuntu/light-locker.