suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflict

Browse Source
This commit is contained in:
wmayer 2017-03-02 13:47:10 +01:00
parent f94e1ff280
commit 30979dcd64
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/PartDesign/App/Body.h
View File

@ -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;
/**