resolve merge conflict

2017-03-02 13:47:10 +01:00
parent f161505280
commit 08f4fbcea9
1 changed files with 1 additions and 1 deletions
--- 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;

    /**