diff options
author | Sebastian Bergmann <sebastian@gentoo.org> | 2005-05-12 13:22:39 +0000 |
---|---|---|
committer | Sebastian Bergmann <sebastian@gentoo.org> | 2005-05-12 13:22:39 +0000 |
commit | d18ae5e35e8cdcc597c996d995ed2095c78d8977 (patch) | |
tree | 1099e2269a1f3de3231d89ae7fc42fa4fc76af14 /x11-misc/xchm | |
parent | Stable on ppc (diff) | |
download | historical-d18ae5e35e8cdcc597c996d995ed2095c78d8977.tar.gz historical-d18ae5e35e8cdcc597c996d995ed2095c78d8977.tar.bz2 historical-d18ae5e35e8cdcc597c996d995ed2095c78d8977.zip |
Remove conflict markers.
Diffstat (limited to 'x11-misc/xchm')
0 files changed, 0 insertions, 0 deletions