From e6bb5b92e21ad08d00e399f30abeaea22f08ca18 Mon Sep 17 00:00:00 2001
From: llornkcor <llornkcor>
Date: Wed, 05 Nov 2003 10:41:28 +0000
Subject: remove <<<<<<

---
(limited to 'core/settings/security/security.cpp')

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
@@ -239,7 +239,7 @@ void Security::setSyncNet(const QString& sn)
 void Security::applySecurity()
 {
     if ( valid ) {
-<<<<<<< security.cpp
+
         Config cfg("Security");
         cfg.setGroup("Passcode");
         cfg.writeEntry("passcode",passcode);
--
cgit v0.9.0.2