make.sh: fix syntax error

i have merged master>next and not deleted this line.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/make.sh b/make.sh
index b4d5ea7a39dbfc6d688aed44034fb1c621df3dbe..d015dd95a0e5a51ca70172570bd5cc1a83d1a403 100755 (executable)
--- 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)