Merge conflicts on branch merging

diff --git a/src/SketchPlugin/SketchPlugin_Tools.cpp b/src/SketchPlugin/SketchPlugin_Tools.cpp
index fe22b3a8b04429b2b0e5bf4a75245ccdb1dc6b44..fd1475aca007fa4337207f0003accc4b7143d286 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_Tools.cpp
+++ b/src/SketchPlugin/SketchPlugin_Tools.cpp
@@ -635,7 +635,7 @@ void replaceInName(ObjectPtr theObject, const std::wstring& theSource, const std
   size_t aPos = aName.find(theSource);
   if (aPos != std::string::npos) {
     std::wstring aNewName = aName.substr(0, aPos) + theDest
-                          + aName.substr(aPos + theSource.size());
+                            + aName.substr(aPos + theSource.size());
     theObject->data()->setName(aNewName);
   }
 }