From: Anders Kaseorg <andersk@mit.edu>
Date: Tue, 25 Nov 2008 04:36:13 +0000 (-0500)
Subject: Clean up stray conflict markers.
X-Git-Tag: 1.1.1~4
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/xvm-prodconfig.git/commitdiff_plain/243ff3b66a31ef4f6b4818a8cdaaf1941f56b8fa?ds=sidebyside;hp=243ff3b66a31ef4f6b4818a8cdaaf1941f56b8fa

Clean up stray conflict markers.

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