From 27b5acb8fd5e6b695a06754788dec2eb2054cf4d Mon Sep 17 00:00:00 2001
From: Steven Valdez <dvorak42@mit.edu>
Date: Thu, 1 Aug 2013 15:57:12 -0400
Subject: [PATCH] Killed diff line

---
 debian/changelog |    1 -
 1 file changed, 1 deletion(-)

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
 
-- 
1.7.9.5