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

diff --git a/misc/tools/conflict-watch.sh b/misc/tools/conflict-watch.sh
index d1c42087..3ac6e5c7 100755
--- a/misc/tools/conflict-watch.sh
+++ b/misc/tools/conflict-watch.sh
@@ -157,7 +157,6 @@ 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.git:refs/remotes/origin/dp-mqc-render) continue ;;
 			esac