From e2e3487dd66610dfdf1c88f677cfb9bff4894a3a Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Sun, 19 Dec 2010 01:20:58 -0500
Subject: gardening

---
 TODO.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/TODO.txt b/TODO.txt
index 1766bb721..88aca5674 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -4,8 +4,6 @@ Pyramid TODOs
 Must-Have (before 1.0)
 ----------------------
 
-- Fix conflict info case for ``scan``.
-
 - Narrative docs for ``Configurator.include`` and ``Configurator.commit``.
 
 - Fix session behavior: when a Forbidden/NotFound hander is invoked, we'd
-- 
cgit v1.2.3