From 72b93ff249c792381f3628b36541a318f8666e6e Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Sun, 8 Sep 2013 22:53:54 -0400
Subject: garden

---
 TODO.txt | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/TODO.txt b/TODO.txt
index 9850bd761..ee7391297 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -121,14 +121,12 @@ Nice-to-Have
 Future
 ------
 
-- 1.5: turn ``pyramid.settings.Settings`` into a function that returns the
-  original dict (after ``__getattr__`` deprecation period, it was deprecated
-  in 1.2).
-
 - 1.5: Maybe? deprecate set_request_property in favor of pointing people at
   add_request_method, schedule removal for 1.8?
 
-- 1.5: Remove pyramid.config.rendering set_renderer_globals_factory maybe.
+- 1.6: turn ``pyramid.settings.Settings`` into a function that returns the
+  original dict (after ``__getattr__`` deprecation period, it was deprecated
+  in 1.2).
 
 - 1.6: Remove IContextURL and TraversalContextURL.
 
-- 
cgit v1.2.3