Fix incorrect merge conflict resolution.

FeralInteractive · May 26, 2020 · 3075814 · 3075814
1 parent 860f7a5
commit 3075814
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/scripts/mkrelease.sh b/scripts/mkrelease.sh
@@ -5,9 +5,8 @@ set -e
 # gamemode tree, including the subprojects, so that it can be trivially
 # packaged by distributions banning networking during build.
 
-# Bump in tandem with meson.build, run script once new tag is up.
-VERSION="1.6-dev"
 NAME="gamemode"
+VERSION=$(git describe --tags --dirty)
 
 # get code in this repo
 git archive HEAD --format=tar --prefix=${NAME}-${VERSION}/ --output=${NAME}-${VERSION}.tar