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
@@ -226,33 +226,33 @@ void Security::toggleAutoLogin(bool val)
         autoLoginName=userlist->currentText();
 }
 
 
 
 
 void Security::setSyncNet(const QString& sn)
 {
     int auth_peer,auth_peer_bits;
     parseNet(sn,auth_peer,auth_peer_bits);
     selectNet(auth_peer,auth_peer_bits);
 }
 
 void Security::applySecurity()
 {
     if ( valid ) {
-<<<<<<< security.cpp
+
         Config cfg("Security");
         cfg.setGroup("Passcode");
         cfg.writeEntry("passcode",passcode);
         cfg.writeEntry("passcode_poweron",passcode_poweron->isChecked());
         cfg.setGroup("Sync");
         int auth_peer=0;
         int auth_peer_bits;
         QString sn = syncnet->currentText();
         parseNet(sn,auth_peer,auth_peer_bits);
         cfg.writeEntry("auth_peer",auth_peer);
         cfg.writeEntry("auth_peer_bits",auth_peer_bits);
         /*
            cfg.setGroup("Remote");
            if ( telnetAvailable() )
            cfg.writeEntry("allow_telnet",telnet->isChecked());
            if ( sshAvailable() )