From 3e11f8257dfe003aaad20d7ca73e3bc831131a96 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 11 Apr 2019 07:34:14 +0200 Subject: [PATCH 1/1] make.sh: fix syntax error i have merged master>next and not deleted this line. Signed-off-by: Arne Fitzenreiter --- make.sh | 1 - 1 file changed, 1 deletion(-) 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) -- 2.39.2