[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3e11f8257dfe003aaad20d7ca73e3bc831131a96

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3e11f8257dfe003aaad20d7ca73e3bc831131a96

[Arne Fitzenreiter]

[-- Attachment #1: Type: text/plain, Size: 1410 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  3e11f8257dfe003aaad20d7ca73e3bc831131a96 (commit)
      from  d27675b08175ed7969d842fdc64f157797911faa (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3e11f8257dfe003aaad20d7ca73e3bc831131a96
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Thu Apr 11 07:34:14 2019 +0200

    make.sh: fix syntax error
    
    i have merged master>next and not deleted this line.
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 make.sh | 1 -
 1 file changed, 1 deletion(-)

Difference in files:
diff --git a/make.sh b/make.sh
index b4d5ea7a3..d015dd95a 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)


hooks/post-receive
--
IPFire 2.x development tree