From 1691723a716b1f00c2307fbf1ac65dbe89fa5e2f Mon Sep 17 00:00:00 2001
From: vsv <vsv@opencascade.com>
Date: Fri, 26 Jun 2020 16:28:36 +0300
Subject: [PATCH] Merge conflicts on branch merging

---
 src/SketchPlugin/SketchPlugin_Tools.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SketchPlugin/SketchPlugin_Tools.cpp b/src/SketchPlugin/SketchPlugin_Tools.cpp
index fe22b3a8b..fd1475aca 100644
--- 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);
   }
 }
-- 
2.39.2