Add AppData file

[xonotic/xonotic.git] / misc / tools / conflict-watch.sh

diff --git a/misc/tools/conflict-watch.sh b/misc/tools/conflict-watch.sh
index c4be58848d0446cd220a305e1b6550c29d9d28f6..3ac6e5c728ea49ebce1546ab9098be179e370abe 100755 (executable)
--- 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