projects / invirt/packages/xvm-prodconfig.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e9b0da3)
Killed diff line dvorak42 1.1.52
authorSteven Valdez <dvorak42@mit.edu>
Thu, 1 Aug 2013 19:57:12 +0000 (15:57 -0400)
committerSteven Valdez <dvorak42@mit.edu>
Thu, 1 Aug 2013 19:57:12 +0000 (15:57 -0400)
debian/changelog patch | blob | history

diff --git a/debian/changelog b/debian/changelog
index 78ba97d..1566697 100644 (file)
--- 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
 
Unnamed repository; edit this file 'description' to name the repository.