Clean up stray conflict markers.

[invirt/packages/xvm-prodconfig.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 33a9906..629dbb0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 xvm-prodconfig (1.1.0) unstable; urgency=low
 
 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
 
 
  -- Evan Broder <broder@mit.edu>  Sat, 22 Nov 2008 05:51:35 -0500
 

@@ -21,9 +21,6 @@ xvm-prodconfig (1.0.2) unstable; urgency=low
   * Move trac over to scripts
 
  -- Evan Broder <broder@mit.edu>  Sat, 15 Nov 2008 23:13:33 -0500
   * Move trac over to scripts
 
  -- 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
 
 
 xvm-prodconfig (1.0.1) unstable; urgency=low