diff options
author | Sven Moritz Hallberg <pesco@khjk.org> | 2009-03-12 20:33:28 +0100 |
---|---|---|
committer | Sven Moritz Hallberg <pesco@khjk.org> | 2009-03-12 20:33:28 +0100 |
commit | 673a54c5a78afd1dd41b4cd8811df5ab65042583 (patch) | |
tree | bffaa961139ac2be20f0875ef0ed37c87d6b18a9 /storage.c | |
parent | 823de9d44f262ea2364ac8ec6a1e18e0f7dab658 (diff) | |
parent | 9e768da723b4a770967efa0d4dcaf58ccef8917f (diff) |
pretty blind try at merging in the latest trunk
Diffstat (limited to 'storage.c')
-rw-r--r-- | storage.c | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -120,7 +120,6 @@ storage_status_t storage_load (irc_t * irc, const char *password) otr_load(irc); return status; } - if (status != STORAGE_NO_SUCH_USER) return status; } |