make.sh: fix syntax error
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 11 Apr 2019 05:34:14 +0000 (07:34 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 11 Apr 2019 05:34:14 +0000 (07:34 +0200)
i have merged master>next and not deleted this line.

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

diff --git a/make.sh b/make.sh
index b4d5ea7..d015dd9 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)