Merge branch 'devel' into MaYor-devdevel

2 files changed, 7 insertions, 1 deletions

diff --git a/egyéb/test.txt b/egyéb/test.txt
new file mode 100644
index 00000000..a2e68a37
--- /dev/null
+++ b/egyéb/test.txt
@@ -0,0 +1,2 @@
+
+aaa
\ No newline at end of file
diff --git a/merge.sh b/merge.sh
index 8595bcfd..1080edb1 100755
--- a/merge.sh
+++ b/merge.sh
@@ -1,11 +1,15 @@
 #!/bin/bash
 
 git checkout master
-git pull local/master MaYor-dev
+git fetch update
+git fetch origin
+
 
 git checkout MaYor-dev
+git pull update master
 git merge devel
 
+
 git checkout master
 git merge MaYor-dev