X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/xvm-prodconfig.git/blobdiff_plain/e9b0da38f0691330dd680eedd4108ea62366e6db..27b5acb8fd5e6b695a06754788dec2eb2054cf4d:/debian/changelog

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