3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-07 06:57:28 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix merge conflict

Browse source
This commit is contained in:
Ghostkeeper 2019-06-19 13:12:42 +02:00
parent 5ab1881a21
commit 91767cf81f
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py
View file

@ -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