| author | llornkcor <llornkcor> | 2003-11-05 10:41:28 (UTC) |
|---|---|---|
| committer | llornkcor <llornkcor> | 2003-11-05 10:41:28 (UTC) |
| commit | e6bb5b92e21ad08d00e399f30abeaea22f08ca18 (patch) (unidiff) | |
| tree | abfaef874a2c729340ba04d9d94c4a0be0955165 | |
| parent | 15163234024750178829812f31a1e7173a66fa1d (diff) | |
| download | opie-e6bb5b92e21ad08d00e399f30abeaea22f08ca18.zip opie-e6bb5b92e21ad08d00e399f30abeaea22f08ca18.tar.gz opie-e6bb5b92e21ad08d00e399f30abeaea22f08ca18.tar.bz2 | |
remove <<<<<<
| -rw-r--r-- | core/settings/security/security.cpp | 2 |
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) | |||
| 239 | void Security::applySecurity() | 239 | void Security::applySecurity() |
| 240 | { | 240 | { |
| 241 | if ( valid ) { | 241 | if ( valid ) { |
| 242 | <<<<<<< security.cpp | 242 | |
| 243 | Config cfg("Security"); | 243 | Config cfg("Security"); |
| 244 | cfg.setGroup("Passcode"); | 244 | cfg.setGroup("Passcode"); |
| 245 | cfg.writeEntry("passcode",passcode); | 245 | cfg.writeEntry("passcode",passcode); |