conflict
authorStefan Schubert <schubi@suse.de>
Wed, 8 Feb 2006 22:32:43 +0000 (22:32 +0000)
committerStefan Schubert <schubi@suse.de>
Wed, 8 Feb 2006 22:32:43 +0000 (22:32 +0000)
commit18a278d4be00b01c85ccc0cea96132bdcdcf5ece
tree8c83d2311493786fcec69a1f73d4f5ef74009d34
parent8fc1ee66e057c1879447f3f2a4a6d385f65aeb26
conflict
testsuite/solver/data.deptestomatic/solution-tests/conflict4-test.xml [new file with mode: 0644]