diff options
| -rwxr-xr-x | localserver/updater.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/localserver/updater.sh b/localserver/updater.sh index 7aa1f2f..a36d047 100755 --- a/localserver/updater.sh +++ b/localserver/updater.sh @@ -22,11 +22,11 @@ if [ -e "./beta.patch2" ] cd ../../server-code git checkout -- src echo "Rolling server back to correct version" - git diff master ce2dbb6acdc559ec256d1f9f9a779b8283064708 > x.diff - ls - head -n 25 x.diff - tail -n 40 x.diff - git apply --reject --whitespace=nowarn x.diff + #git diff master ce2dbb6acdc559ec256d1f9f9a779b8283064708 > x.diff + #ls + #head -n 25 x.diff + #tail -n 40 x.diff + #git apply --reject --whitespace=nowarn x.diff git status ls --recursive|grep ".rej" cd ../tools/localserver |