From 39f93e4000cbd92fc57c2750935827ef41ab3efe Mon Sep 17 00:00:00 2001
From: Ahsan Fayaz <afayaz@feralinteractive.com>
Date: Tue, 26 May 2020 17:39:53 +0100
Subject: [PATCH] Fix incorrect merge conflict resolution.

---
 scripts/mkrelease.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/mkrelease.sh b/scripts/mkrelease.sh
index a1dc793..7f21bfc 100755
--- 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