Makefile_upgrade.inc: Remove conflict marker.
authorSascha Wildner <saw@online.de>
Thu, 6 May 2010 21:00:57 +0000 (23:00 +0200)
committerSascha Wildner <saw@online.de>
Thu, 6 May 2010 21:00:57 +0000 (23:00 +0200)
On-behalf-of: lentferj

Makefile_upgrade.inc

index 31bee87..726e995 100644 (file)
@@ -1397,4 +1397,3 @@ TO_REMOVE+=/usr/share/man/cat8/named.reload.8.gz
 TO_REMOVE+=/usr/share/man/cat8/named.restart.8.gz
 TO_REMOVE+=/usr/share/man/cat8/rndc-confgen.8.gz
 TO_REMOVE+=/usr/share/man/cat8/rndc.8.gz
->>>>>>> BIND-Removal: Add removals to make upgrade.