cairo-dock-team team mailing list archive

[Luke Yelavich <luke.yelavich@xxxxxxxxxxxxx>]

Review: Needs Fixing

When attempting to merge your branch into lp:ubuntu/cairo-dock, I still get 2 conflicts:

luke@acapella:~/Ubuntu/quantal/bzr/cairo-dock/cairo-dock$ bzr conflicts
Text conflict in src/gldit/cairo-dock-callbacks.c
Text conflict in src/gldit/cairo-dock-dock-factory.c

Did you branch against the latest changes in the lp:ubuntu/cairo-dock package, or have I missed something?

Thanks for your work.
-- 
https://code.launchpad.net/~cairo-dock-team/ubuntu/quantal/cairo-dock/3.0.2/+merge/111020
Your team Cairo-Dock Team is subscribed to branch lp:~cairo-dock-team/ubuntu/quantal/cairo-dock/3.0.2.