Index: trunk/packages/xvm-prodconfig/debian/changelog
===================================================================
--- trunk/packages/xvm-prodconfig/debian/changelog	(revision 1765)
+++ trunk/packages/xvm-prodconfig/debian/changelog	(revision 1766)
@@ -1,5 +1,5 @@
 xvm-prodconfig (1.1.0) unstable; urgency=low
 
-    * Add a specification for a monitoring host (in our case, syn)
+  * Add a specification for a monitoring host (in our case, syn)
 
  -- Evan Broder <broder@mit.edu>  Sat, 22 Nov 2008 05:51:35 -0500
@@ -22,7 +22,4 @@
 
  -- Evan Broder <broder@mit.edu>  Sat, 15 Nov 2008 23:13:33 -0500
-=======
- -- Evan Broder <broder@mit.edu>  Fri, 21 Nov 2008 22:48:21 -0500
->>>>>>> Add a specification for a monitoring host (i.e. syn):packages/xvm-prodconfig/debian/changelog
 
 xvm-prodconfig (1.0.1) unstable; urgency=low