From 942f476f4439ecc3e0c7380c5632f74004ee5861 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Fri, 22 Jan 2021 17:52:45 +0100
Subject: [PATCH] fix merge

---
 .../patch.sh                                                  | 4 ++--
 .../patch.sql                                                 | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename patches/{patch20200903-4.0.0-rc1 => patch20210122-4.0.0-rc3}/patch.sh (95%)
 rename patches/{patch20200903-4.0.0-rc1 => patch20210122-4.0.0-rc3}/patch.sql (100%)

diff --git a/patches/patch20200903-4.0.0-rc1/patch.sh b/patches/patch20210122-4.0.0-rc3/patch.sh
similarity index 95%
rename from patches/patch20200903-4.0.0-rc1/patch.sh
rename to patches/patch20210122-4.0.0-rc3/patch.sh
index 9d9293c..cba213d 100755
--- a/patches/patch20200903-4.0.0-rc1/patch.sh
+++ b/patches/patch20210122-4.0.0-rc3/patch.sh
@@ -24,8 +24,8 @@
 
 # Refactors the entities table and move all names to name_data
 # Update mysql schema to version v3.0.0-rc1
-NEW_VERSION="v4.0.0-rc1"
-OLD_VERSION="v3.0.0-rc2"
+NEW_VERSION="v4.0.0-rc3"
+OLD_VERSION="v4.0.0-rc2"
 
 if [ -z "$UTILSPATH" ]; then
  UTILSPATH="../utils"
diff --git a/patches/patch20200903-4.0.0-rc1/patch.sql b/patches/patch20210122-4.0.0-rc3/patch.sql
similarity index 100%
rename from patches/patch20200903-4.0.0-rc1/patch.sql
rename to patches/patch20210122-4.0.0-rc3/patch.sql
-- 
GitLab