From: Steven Valdez <dvorak42@mit.edu>
Date: Thu, 1 Aug 2013 19:57:12 +0000 (-0400)
Subject: Killed diff line
X-Git-Tag: 1.1.52^0
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/xvm-prodconfig.git/commitdiff_plain/27b5acb8fd5e6b695a06754788dec2eb2054cf4d?ds=sidebyside

Killed diff line
---

diff --git a/debian/changelog b/debian/changelog
index 78ba97d..1566697 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,7 +15,6 @@ xvm-prodconfig (1.1.50) precise; urgency=low
   * Update s_remote and s_console sysvm definitions for precise.
 
  -- Adam Glasgall <glasgall@mit.edu>  Tue, 23 Jul 2013 23:43:44 -0400
->>>>>>> origin/glasgall-precise
 
 xvm-prodconfig (1.1.49) unstable; urgency=low