From a10b07578b2357ae0f6adff91012c75efc59ebb1 Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@atheme.org>
Date: Sun, 8 Jun 2008 01:09:52 -0500
Subject: [PATCH] Finish merge.

---
 TODO | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/TODO b/TODO
index 100bbf5..c1aa49b 100644
--- a/TODO
+++ b/TODO
@@ -23,12 +23,8 @@
   [x] remote d:lines support
 [F] kline/xline/resv sync
 [F] make an ability of using bandb instead of .conf files as bans storage
-<<<<<<< local
 [/] drop non-TS6 (legacy protocol) support
-=======
-[F] drop non-TS6 (legacy protocol) support
 [F] Doxygen code documentation
->>>>>>> other
 [F] module engine rework
   [F] more beautiful way of adding new channel modes by module
   [F] make nick/user/host validation functions/match tables able to work in separated modules,