[Merge] lp:~udienz/ubuntu/maverick/light-themes/light-themes.fix549365 into lp:ubuntu/maverick-proposed/light-themes

Daniel Holbach daniel.holbach at ubuntu.com
Tue Dec 21 09:43:13 GMT 2010


Review: Needs Fixing
It looks like there are a bunch of merge conflicts:
Text conflict in Ambiance/gtk-2.0/gtkrc
Text conflict in Radiance/gtk-2.0/gtkrc
Text conflict in debian/changelog

Can you try to fix these? (Maybe branch lp:ubuntu/maverick-proposed/light-themes and apply your fix again.)
-- 
https://code.launchpad.net/~udienz/ubuntu/maverick/light-themes/light-themes.fix549365/+merge/42840
Your team Ubuntu Development Team is requested to review the proposed merge of lp:~udienz/ubuntu/maverick/light-themes/light-themes.fix549365 into lp:ubuntu/maverick-proposed/light-themes.



More information about the Ubuntu-reviews mailing list