Clean up stray conflict markers.

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

diff --git a/debian/changelog b/debian/changelog
index af1f40a..629dbb0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xvm-prodconfig (1.1.0) unstable; urgency=low
+
+  * Add a specification for a monitoring host (in our case, syn)
+
+ -- Evan Broder <broder@mit.edu>  Sat, 22 Nov 2008 05:51:35 -0500
+
 xvm-prodconfig (1.0.4) unstable; urgency=low
 
   * Remove the stray dot from the config