Clean up stray conflict markers.
authorAnders Kaseorg <andersk@mit.edu>
Tue, 25 Nov 2008 04:36:13 +0000 (23:36 -0500)
committerAnders Kaseorg <andersk@mit.edu>
Tue, 25 Nov 2008 04:36:13 +0000 (23:36 -0500)
commit243ff3b66a31ef4f6b4818a8cdaaf1941f56b8fa
tree602df16fb7dcaa891dd5152144091ec5050d8b80
parent1d51350dab4d099bc2aa2514a88bd9c4c85340a2
Clean up stray conflict markers.

svn path=/trunk/packages/xvm-prodconfig/; revision=1766
debian/changelog