From bef75e85b84e231b588eec3f83ea0fc33ec9d8a6 Mon Sep 17 00:00:00 2001
From: M.Gergo
Date: Wed, 15 Jun 2022 04:47:24 +0200
Subject: merge

---
 .#merge.sh |  1 -
 merge.sh   | 12 ++++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)
 delete mode 120000 .#merge.sh
 create mode 100755 merge.sh

diff --git a/.#merge.sh b/.#merge.sh
deleted file mode 120000
index 8a4d075a..00000000
--- a/.#merge.sh
+++ /dev/null
@@ -1 +0,0 @@
-gergo@here.5649
\ No newline at end of file
diff --git a/merge.sh b/merge.sh
new file mode 100755
index 00000000..8595bcfd
--- /dev/null
+++ b/merge.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+git checkout master
+git pull local/master MaYor-dev
+
+git checkout MaYor-dev
+git merge devel
+
+git checkout master
+git merge MaYor-dev
+
+
-- 
cgit v1.2.3