From 91482cb38d4324c74425f3b7bf54aa8b227e12d7 Mon Sep 17 00:00:00 2001 From: Roy-043 Date: Sat, 23 Nov 2024 13:10:16 +0100 Subject: [PATCH] Solve merge conflict OK, there was indeed a merge conflict due to reformatting. --- src/App/Property.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App/Property.h b/src/App/Property.h index f222148d65..5448777649 100644 --- a/src/App/Property.h +++ b/src/App/Property.h @@ -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