1
2
3
4
5
6
7
8
9
10
11
12
13
14
15 | 27 +<<<<<<< TREE 28 "X-Launchpad-Export-Date: 2015-03-11 05:50+0000\n" 29 "X-Generator: Launchpad (build 17389)\n" 30 "Language: \n" 31 +======= 32 +"Language: \n" 33 +"X-Generator: Launchpad (build 17383)\n" 34 +"X-Launchpad-Export-Date: 2015-03-07 05:49+0000\n" 35 +>>>>>>> MERGE-SOURCE make it like this: 28 "X-Launchpad-Export-Date: 2015-03-11 05:50+0000\n" 29 "X-Generator: Launchpad (build 17389)\n" 30 "Language: \n" |