From: Steven Valdez <dvorak42@mit.edu>
Date: Wed, 31 Jul 2013 22:00:41 +0000 (-0400)
Subject: Removed extraneous diff line
X-Git-Tag: 0.1.37^0
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/commitdiff_plain/49044a689bb197e6651e55d71899a59be62a4bac?ds=sidebyside;hp=69f46741235bec678d9df3d8b741ea3e2d8f2838

Removed extraneous diff line
---

diff --git a/debian/changelog b/debian/changelog
index 60de897..f3b8baf 100644
--- 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