firewall: Use seperate firewall chains for passing traffic to the IPS

[ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index b4d5ea7a39dbfc6d688aed44034fb1c621df3dbe..51ddda6a7af3d8d2a059e7378379db6127af147a 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,10 +24,9 @@
 
 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)
+PAKFIRE_CORE="131"                                             # Core Level (PAKFIRE)
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                   # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir