aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorM.Gergo2022-06-15 04:35:04 +0200
committerM.Gergo2022-06-15 04:35:04 +0200
commitf0c7508f88e2194e31c1c41b307c7da4156aefbd (patch)
treedb16432dc6ae491615905a3e2abd2d4a8d6b10fc
parent44241c611369f5325e1105e8795efca94dc28906 (diff)
downloadmayor-f0c7508f88e2194e31c1c41b307c7da4156aefbd.tar.gz
mayor-f0c7508f88e2194e31c1c41b307c7da4156aefbd.zip
Rev: 4834
l---------.#merge.sh1
-rwxr-xr-xcheckupdate.sh7
2 files changed, 5 insertions, 3 deletions
diff --git a/.#merge.sh b/.#merge.sh
new file mode 120000
index 00000000..8a4d075a
--- /dev/null
+++ b/.#merge.sh
@@ -0,0 +1 @@
+gergo@here.5649 \ No newline at end of file
diff --git a/checkupdate.sh b/checkupdate.sh
index 47febde4..8c363232 100755
--- a/checkupdate.sh
+++ b/checkupdate.sh
@@ -1,7 +1,8 @@
#!/bin/bash
-git checkout MaYor-dev
+#git checkout MaYor-dev
+git checkout master
if [ $? == 0 ]; then
orev=$(cat rev.txt)
@@ -40,7 +41,7 @@ if [ $? == 0 ]; then
fi
- git checkout @{-1}
+# git checkout @{-1}
fi
- \ No newline at end of file
+