Index: sources/view/settings/VSettings.cpp
===================================================================
diff -u -rd2c4e611703fcb97794975dbc28f9a030b84bbf0 -r77e7c1e746bba703ab3aee61f8e19f398fd9ac00
--- sources/view/settings/VSettings.cpp	(.../VSettings.cpp)	(revision d2c4e611703fcb97794975dbc28f9a030b84bbf0)
+++ sources/view/settings/VSettings.cpp	(.../VSettings.cpp)	(revision 77e7c1e746bba703ab3aee61f8e19f398fd9ac00)
@@ -44,7 +44,6 @@
     PROPERTY_POST_CONNECTION(VSettings, integratedBPCuff    );
     PROPERTY_POST_CONNECTION(VSettings, heparinSyringePump  );
     PROPERTY_POST_CONNECTION(VSettings, chemicalDisinfection);
->>>>>>> Stashed changes
     init = true;
 }
 
@@ -135,6 +134,7 @@
                         mUserMode       = _Settings.value(category, group, key).toBool    ();
                         keyValue[key]   = mUserMode ;
                         userMode        ( mUserMode);
+                    }
                     else if ( isintegratedBPCuff   (category, group, key) ) {
                         bool mIntegratedBPCuff;
                         mIntegratedBPCuff   = _Settings.value(category, group, key).toBool    ();