Changeset 1766

Timestamp:

Nov 24, 2008, 11:36:13 PM (16 years ago)

Author:

andersk

Message:

Clean up stray conflict markers.

File:

• trunk/packages/xvm-prodconfig/debian/changelog (modified) (2 diffs)

trunk/packages/xvm-prodconfig/debian/changelog

@@ -1 +1 @@
 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 +22 @@
 
  -- 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