http://wuselfuzz.de:3000/Veronie/BggToolAnother.git Conflicts: xyz.veronie.bgg.ui/src/xyz/veronie/bgg/result/ThingProvider.java xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/parts/BggResultPart.java xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/parts/PreparePart.java