kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Solve merge conflict

Browse Source 
OK, there was indeed a merge conflict due to reformatting.
This commit is contained in:
Roy-043
2024-11-23 13:10:16 +01:00
committed by Chris Hennes
parent ffd3a79751
commit 91482cb38d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/App/Property.h
View File

@@ -71,7 +71,7 @@ public:
LockDynamic = 8, // prevent being removed from dynamic property
NoModify = 9, // prevent causing Gui::Document::setModified()
PartialTrigger = 10, // allow change in partial doc
NoRecompute = 11, // touch owner for recompute on property change
NoRecompute = 11, // don't touch owner for recompute on property change
Single = 12, // for save/load of floating point numbers
Ordered = 13, // for PropertyLists whether the order of the elements is
// relevant for the container using it