]> err.no Git - dpkg/commit
zap old conflict indicator
authorWichert Akkerman <wakkerma@debian.org>
Fri, 20 Apr 2001 21:07:45 +0000 (21:07 +0000)
committerWichert Akkerman <wakkerma@debian.org>
Fri, 20 Apr 2001 21:07:45 +0000 (21:07 +0000)
commit341b794d97bcad54191fca0d3d5ae3999d4a78fe
tree31feaf24d3eb72f324f93aee6e16cc495a7cca68
parent468bbe187b470d9d68f9d1f3df36b124db502bfa
zap old conflict indicator
ChangeLog