Merge branch 'master' of feistymeow.org:feisty_meow

[feisty_meow.git] / scripts / rev_control / fix_svn_item.sh

diff --git a/scripts/rev_control/fix_svn_item.sh b/scripts/rev_control/fix_svn_item.sh
deleted file mode 100644 (file)
index 941e572..0000000
--- a/scripts/rev_control/fix_svn_item.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# resolves a tree conflict by accepting the "working" version,
-# which effectively makes your current change the accepted one.
-
-filename="$1"; shift
-
-svn resolve --accept=working "$filename"
-
-