From 30979dcd648944a53b00422888f006026c1a7e5c Mon Sep 17 00:00:00 2001 From: wmayer Date: Thu, 2 Mar 2017 13:47:10 +0100 Subject: [PATCH] resolve merge conflict --- src/Mod/PartDesign/App/Body.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mod/PartDesign/App/Body.h b/src/Mod/PartDesign/App/Body.h index 1e6956dee..d44153793 100644 --- a/src/Mod/PartDesign/App/Body.h +++ b/src/Mod/PartDesign/App/Body.h @@ -121,7 +121,7 @@ public: protected: virtual void onSettingDocument() override; - /// Adjusts the first solid's feature's base on on BaseFeature getting setted + /// Adjusts the first solid's feature's base on BaseFeature getting set virtual void onChanged (const App::Property* prop) override; /**