Merge remote-tracking branch 'github/master'

[stg.git] / include / stg / user_property.h

diff --git a/include/stg/user_property.h b/include/stg/user_property.h
index d73a636b2df42b82ae0296f395dfd6ef4caac6d4..3400abd0494f4a19913f42b0d13790f9bd5beb9a 100644 (file)
--- a/include/stg/user_property.h
+++ b/include/stg/user_property.h
@@ -7,7 +7,6 @@
 #include "stg/subscriptions.h"
 #include "stg/admin_conf.h"
 #include "stg/logger.h"
 #include "stg/subscriptions.h"
 #include "stg/admin_conf.h"
 #include "stg/logger.h"

-#include "stg/locker.h"

 #include "stg/settings.h"
 #include "stg/scriptexecuter.h"
 #include "stg/common.h"
 #include "stg/settings.h"
 #include "stg/scriptexecuter.h"
 #include "stg/common.h"