From 91767cf81f00022d9e7ab091d27d0b161c20507c Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 19 Jun 2019 13:12:42 +0200 Subject: [PATCH] Fix merge conflict --- plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py b/plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py index 7e65156c0c..8fe718ca83 100644 --- a/plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py +++ b/plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py @@ -56,8 +56,4 @@ def getMetaData() -> Dict[str, Any]: def register(app: "Application") -> Dict[str, Any]: -<<<<<<< HEAD - return {"version_upgrade": upgrade} -======= return { "version_upgrade": upgrade } ->>>>>>> master