summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2004-05-31 10:14:20 +0000
committerAndreas Gruenbacher <agruen@suse.de>2004-05-31 10:14:20 +0000
commitced252dabbef9fd962a2f0d268a818c37815b8b4 (patch)
tree332fce2cd40910b0e43853e3801f592c12993880 /bin
parent37732bf1d2a38f636b83a7b321999d83f8290348 (diff)
downloadquilt-ced252dabbef9fd962a2f0d268a818c37815b8b4.tar.gz
- Remove conflict markers.
Diffstat (limited to 'bin')
0 files changed, 0 insertions, 0 deletions