From: vsv <vsv@opencascade.com>
Date: Fri, 26 Jun 2020 13:28:36 +0000 (+0300)
Subject: Merge conflicts on branch merging
X-Git-Tag: V9_6_0a1~60^2~28
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1691723a716b1f00c2307fbf1ac65dbe89fa5e2f;p=modules%2Fshaper.git

Merge conflicts on branch merging
---

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);
   }
 }