Removed extraneous diff line

diff --git a/debian/changelog b/debian/changelog
index 60de897..f3b8baf 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+invirt-web (0.1.37) unstable; urgency=low
+
+  * Fixed changelog entries.
+
+ -- Steven Valdez <dvorak42@mit.edu>  Wed, 31 Jul 2013 17:59:53 -0400
+
 invirt-web (0.1.36) unstable; urgency=low
 
   * Punched version.
@@ -15,7 +21,6 @@ invirt-web (0.1.34) precise; urgency=low
   * Use config-package-dev.
 
  -- Alexander Chernyakhovsky <achernya@mit.edu>  Sun, 21 Jul 2013 12:42:40 -0400
->>>>>>> d7b8e92
 
 invirt-web (0.1.33) precise; urgency=low