From af156a4e1b1caefd111f68057e44f6f8b37a864c Mon Sep 17 00:00:00 2001
From: "Kay Marquardt (Gnadelwartz)" <kay@rrr.de>
Date: Thu, 25 Jun 2020 13:32:36 +0200
Subject: [PATCH] fix merge conflict

---
 bashbot.sh              | 8 +-------
 dev/hooks/pre-commit.sh | 2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/bashbot.sh b/bashbot.sh
index 5ef06bf..aba2f7d 100755
--- a/bashbot.sh
+++ b/bashbot.sh
@@ -11,7 +11,7 @@
 # This file is public domain in the USA and all free countries.
 # Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
 #
-#### $$VERSION$$ v0.98-dev-73-ge7739b8
+#### $$VERSION$$ v0.98-dev-70-g694ee61
 #
 # Exit Codes:
 # - 0 success (hopefully)
@@ -847,14 +847,8 @@ process_message() {
 declare -A BASHBOTBLOCKED
 export BASHBOTDEBUG
 start_bot() {
-<<<<<<< HEAD
-	local DEBUG="$1"
-	local OFFSET=0
-	# adaptive sleep deafults
-=======
 	local ADMIN OFFSET=0
 	# adaptive sleep defaults
->>>>>>> develop
 	local nextsleep="100"
 	local stepsleep="${BASHBOT_SLEEP_STEP:-100}"
 	local maxsleep="${BASHBOT_SLEEP:-5000}"
diff --git a/dev/hooks/pre-commit.sh b/dev/hooks/pre-commit.sh
index b71cecf..14e970d 100755
--- a/dev/hooks/pre-commit.sh
+++ b/dev/hooks/pre-commit.sh
@@ -43,7 +43,7 @@ else
 fi
 
 REMOTEVER="$(git ls-remote -t --refs 2>/dev/null | tail -1 | sed -e 's/.*\/v//' -e 's/-.*//')"
-VERSION="$(git describe --tags | sed -e 's/-.*//' -e 's/v//')"
+VERSION="$(git describe --tags | sed -e 's/-.*//' -e 's/v//' -e 's/,/./')"
 
 
 # LOCAL version must greater than latest REMOTE release version