X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=misc%2Ftools%2Fconflict-watch.sh;h=3ac6e5c728ea49ebce1546ab9098be179e370abe;hb=c74ac8ba7462328db420aea437ec1f978fbfd739;hp=c4be58848d0446cd220a305e1b6550c29d9d28f6;hpb=c91f8f79dd05d4b45dddf31721acad66467f8beb;p=xonotic%2Fxonotic.git

diff --git a/misc/tools/conflict-watch.sh b/misc/tools/conflict-watch.sh
index c4be5884..3ac6e5c7 100755
--- a/misc/tools/conflict-watch.sh
+++ b/misc/tools/conflict-watch.sh
@@ -157,9 +157,7 @@ case "$action" in
 				xonotic/netradiant.git:refs/remotes/origin/divVerent/zeroradiant-original) continue ;;
 				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