From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 11 Apr 2019 05:34:14 +0000 (+0200)
Subject: make.sh: fix syntax error
X-Git-Tag: v2.23-core131~41
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=3e11f8257dfe003aaad20d7ca73e3bc831131a96;hp=d27675b08175ed7969d842fdc64f157797911faa

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 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)