X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=d015dd95a0e5a51ca70172570bd5cc1a83d1a403;hp=b4d5ea7a39dbfc6d688aed44034fb1c621df3dbe;hb=3e11f8257dfe003aaad20d7ca73e3bc831131a96;hpb=d27675b08175ed7969d842fdc64f157797911faa

diff --git a/make.sh b/make.sh
index b4d5ea7a39..d015dd95a0 100755
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,6 @@
 
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
-<<<<<<< HEAD
 VERSION="2.23"							# Version number
 CORE="131"							# Core Level (Filename)
 PAKFIRE_CORE="130"						# Core Level (PAKFIRE)