NAME="IPFire" # Software name
SNAME="ipfire" # Short name
+<<<<<<< HEAD
VERSION="2.23" # Version number
-CORE="130" # Core Level (Filename)
-PAKFIRE_CORE="129" # Core Level (PAKFIRE)
+CORE="131" # Core Level (Filename)
+PAKFIRE_CORE="130" # 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