cairo-dock-team team mailing list archive

[Matthieu Baerts <matttbe@xxxxxxxxx>]

If I remove all patches and then use bzr merge-upstream (lp:~cairo-dock-team/ubuntu/quantal/cairo-dock/3.0.2-1), I still have the same problem :-/

Note that you can use the .OTHER files if you want to manually fix the conflicts but it seems there is also a conflict in src/gldit/cairo-dock-keybinder.h (it should be unmodified)
I resolve conflicts in lp:~cairo-dock-team/ubuntu/quantal/cairo-dock/3.0.2-without-conflict
I guess you can directly use 'bzr pull lp:~cairo-dock-team/ubuntu/quantal/cairo-dock/3.0.2-without-conflict'
-- 
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.