[Merge] lp:~noskcaj/ubuntu/utopic/celery/merge into lp:ubuntu/celery

[Daniel Holbach]

Review: Needs Fixing

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

-- 
https://code.launchpad.net/~noskcaj/ubuntu/utopic/celery/merge/+merge/221789
Your team Ubuntu branches is subscribed to branch lp:ubuntu/celery.