From: Rudolf Polzer <divverent@alientrap.org>
Date: Mon, 14 May 2012 18:47:47 +0000 (+0200)
Subject: oops :)
X-Git-Tag: xonotic-v0.7.0~55^2~1
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=7ee94f1dfbdb9be9e52ed44fca35d27dbbefab84

oops :)
---

diff --git a/misc/tools/conflict-watch.sh b/misc/tools/conflict-watch.sh
index c4be5884..d1c42087 100755
--- a/misc/tools/conflict-watch.sh
+++ b/misc/tools/conflict-watch.sh
@@ -158,8 +158,7 @@ case "$action" in
 				xonotic/netradiant.git:refs/remotes/origin/divVerent/zeroradiant-split-up-the-q3map2-commit) continue ;;
 				xonotic/netradiant.git:refs/remotes/origin/divVerent/zeroradiant-split-up-the-q3map2-commit-goal) continue ;;
 				xonotic/fteqcc.git:refs/remotes/origin/wip) continue ;;
-				xonotic/darkplaces:refs/remotes/origin/master) continue ;;
-				xonotic/darkplaces:refs/remotes/origin/dp-mqc-render) continue ;;
+				xonotic/darkplaces.git:refs/remotes/origin/dp-mqc-render) continue ;;
 			esac
 
 			if [ x"$masterhash" = x"$masterhash2" ]; then