[Bug 89514] polyesterstylerc contains merge junk (in feisty)

[Alexis ROBERT]

Public bug reported:

Binary package hint: kubuntu-default-settings

I've upgraded kubuntu-default-settings to 1:7.04-24 and we discovered
that /etc/qt3/polyesterstylerc contains merge junk :

<<<<<<< TREE
shadowedButtonsText=true
shadowedMenuBarText=false
=======
shadowedButtonsText=false
shadowedMenuBarText=false
>>>>>>> MERGE-SOURCE

Thanks to Pierre-Hugues Husson for discovering this bug.

** Affects: kubuntu-default-settings (Ubuntu)
     Importance: Undecided
         Status: Unconfirmed

-- 
polyesterstylerc contains merge junk (in feisty)
https://launchpad.net/bugs/89514