summaryrefslogtreecommitdiff
path: root/core
authorllornkcor <llornkcor>2003-11-05 10:41:28 (UTC)
committer llornkcor <llornkcor>2003-11-05 10:41:28 (UTC)
commite6bb5b92e21ad08d00e399f30abeaea22f08ca18 (patch) (side-by-side diff)
treeabfaef874a2c729340ba04d9d94c4a0be0955165 /core
parent15163234024750178829812f31a1e7173a66fa1d (diff)
downloadopie-e6bb5b92e21ad08d00e399f30abeaea22f08ca18.zip
opie-e6bb5b92e21ad08d00e399f30abeaea22f08ca18.tar.gz
opie-e6bb5b92e21ad08d00e399f30abeaea22f08ca18.tar.bz2
remove <<<<<<
Diffstat (limited to 'core') (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/security/security.cpp2
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
@@ -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);