From: Anders Kaseorg 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 Clean up stray conflict markers. svn path=/trunk/packages/xvm-prodconfig/; revision=1766 --- diff --git a/debian/changelog b/debian/changelog index 33a9906..629dbb0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ 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 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 Sat, 15 Nov 2008 23:13:33 -0500 -======= - -- Evan Broder 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