aboutsummaryrefslogtreecommitdiffstats
path: root/storage.c
diff options
context:
space:
mode:
authorSven Moritz Hallberg <pesco@khjk.org>2009-03-12 20:33:28 +0100
committerSven Moritz Hallberg <pesco@khjk.org>2009-03-12 20:33:28 +0100
commit673a54c5a78afd1dd41b4cd8811df5ab65042583 (patch)
treebffaa961139ac2be20f0875ef0ed37c87d6b18a9 /storage.c
parent823de9d44f262ea2364ac8ec6a1e18e0f7dab658 (diff)
parent9e768da723b4a770967efa0d4dcaf58ccef8917f (diff)
pretty blind try at merging in the latest trunk
Diffstat (limited to 'storage.c')
-rw-r--r--storage.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/storage.c b/storage.c
index 0ff2d34d..2788ba2a 100644
--- a/storage.c
+++ b/storage.c
@@ -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;
}