From: adam <adam@megacz.com>
Date: Sun, 21 Jan 2007 23:13:38 +0000 (+0000)
Subject: more conflict resolution
X-Git-Url: http://git.megacz.com/?p=org.ibex.mail.git;a=commitdiff_plain;h=7e733c645cc127a2eca2b4a3ef320c97e98e606a;hp=e2f945712cd67ace6e629f73beb662f7ecb7beaa

more conflict resolution

darcs-hash:20070121231338-5007d-c431d39ed245a906e56207d712b5ebdc08cef150.gz
---

diff --git a/src/org/ibex/mail/protocol/NNTP.java b/src/org/ibex/mail/protocol/NNTP.java
index 55d2136..c4155fd 100644
--- a/src/org/ibex/mail/protocol/NNTP.java
+++ b/src/org/ibex/mail/protocol/NNTP.java
@@ -111,15 +111,9 @@ public class NNTP {
         }
         private Group getgroup(String s) {
             Mailbox box = root;
-v v v v v v v
-            Log.error("", "getgroup " + s);
-            Log.error("", "mailbox " + root);
-            for(StringTokenizer st = new StringTokenizer(s, "."); box!=null && st.hasMoreTokens(); box = box.slash(st.nextToken(), false));
-*************
             for(StringTokenizer st = new StringTokenizer(s, ".");
                 box!=null && st.hasMoreTokens();
                 box = box.slash(st.nextToken(), false));
-^ ^ ^ ^ ^ ^ ^
             if (box==null) return null;
             return new Group(s, true, 1, box.count(Query.all()), box.count(Query.all()));
         }