Fix merge conflict

This commit is contained in:
ChrisTerBeke 2018-12-13 11:48:35 +01:00
commit 36f5150d94
73 changed files with 1758 additions and 474 deletions

View file

@ -50,6 +50,23 @@
}
}
},
"CuraDrive": {
"package_info": {
"package_id": "CuraDrive",
"package_type": "plugin",
"display_name": "Cura Backups",
"description": "Backup and restore your configuration.",
"package_version": "1.2.0",
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
}
}
},
"CuraEngineBackend": {
"package_info": {
"package_id": "CuraEngineBackend",