1 files changed, 1 insertions, 1 deletions

diff --git a/core/settings/security/security.cpp b/core/settings/security/security.cpp
index 00ea105..42a39c2 100644
--- a/core/settings/security/security.cpp
+++ b/core/settings/security/security.cpp
@@ -241,3 +241,3 @@ void Security::applySecurity()
     if ( valid ) {
-<<<<<<< security.cpp
+
         Config cfg("Security");