1 === modified file 'debian/changelog' 2 --- debian/changelog 2012-07-17 10:50:17 +0000 3 +++ debian/changelog 2012-08-14 15:26:39 +0000 4 @@ -1,3 +1,4 @@ 5 +<<<<<<< TREE 6 kexec-tools (1:2.0.3-1ubuntu1) quantal; urgency=low 7 8 * Merge from Debian (LP: #1020965); remaining changes: 9 @@ -24,6 +25,15 @@ 10 11 -- Khalid Aziz <email address hidden> Tue, 31 Jan 2012 09:11:31 -0700 12 13 +======= 14 +kexec-tools (1:2.0.2-3ubuntu4.1) precise-proposed; urgency=low 15 + 16 + * Removed dependency to vmcoreinfo which is no longer required 17 + and no longer part of the kernel package 18 + 19 + -- Louis Bouchard <email address hidden> Tue, 14 Aug 2012 17:14:30 +0200 20 + 21 +>>>>>>> MERGE-SOURCE
That portion of the diff needs to be fixed as it looks like a merge conflict
« Back to merge proposal
1 === modified file 'debian/changelog' 2-3ubuntu4. 1) precise-proposed; urgency=low
2 --- debian/changelog 2012-07-17 10:50:17 +0000
3 +++ debian/changelog 2012-08-14 15:26:39 +0000
4 @@ -1,3 +1,4 @@
5 +<<<<<<< TREE
6 kexec-tools (1:2.0.3-1ubuntu1) quantal; urgency=low
7
8 * Merge from Debian (LP: #1020965); remaining changes:
9 @@ -24,6 +25,15 @@
10
11 -- Khalid Aziz <email address hidden> Tue, 31 Jan 2012 09:11:31 -0700
12
13 +=======
14 +kexec-tools (1:2.0.
15 +
16 + * Removed dependency to vmcoreinfo which is no longer required
17 + and no longer part of the kernel package
18 +
19 + -- Louis Bouchard <email address hidden> Tue, 14 Aug 2012 17:14:30 +0200
20 +
21 +>>>>>>> MERGE-SOURCE
That portion of the diff needs to be fixed as it looks like a merge conflict