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)
svn path=/trunk/packages/xvm-prodconfig/; revision=1766


No differences found