ups, fix merge rests
authorAdrian Schröter <adrian@suse.de>
Tue, 2 Feb 2010 16:29:17 +0000 (17:29 +0100)
committerAdrian Schröter <adrian@suse.de>
Tue, 2 Feb 2010 16:29:17 +0000 (17:29 +0100)
commit2fa0845f2beb008bd5dd743f1870c316e703d42e
treebed38c95961f63b2c7d816929acd8687b3f7bf93
parent3e4eed6442abcb8309707904a1c043e35eb4382b
ups, fix merge rests
src/backend/bs_productconvert