From 99b236c8d48e730df7a85f32fef8746c00029ec1 Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Mon, 17 Jul 2017 11:08:31 +0200
Subject: [PATCH] Removed "fix" that caused project files to create new
 instances if there was no conflict.

The overriding doesn't make any sense. The original commit mentions that it should fix something, but it doesn't acutally fix it. It seems
the original issue was fixed in the proper place, leaving this code to mess everything up.

CURA-3756
---
 plugins/3MFReader/ThreeMFWorkspaceReader.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py
index 4d668b17ac..7afdf74b2e 100755
--- a/plugins/3MFReader/ThreeMFWorkspaceReader.py
+++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py
@@ -305,9 +305,6 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
         #               In this case, you can either create a new one, or safely override the existing one.
         #
         # Default values
-        for k, v in self._resolve_strategies.items():
-            if v is None:
-                self._resolve_strategies[k] = "new"
 
         return WorkspaceReader.PreReadResult.accepted