From e4325bc56580a8e6df7aca64b9d101f10c5fc782 Mon Sep 17 00:00:00 2001
From: Mike Macgirvin <mike@macgirvin.com>
Date: Tue, 13 Jul 2010 04:18:57 -0700
Subject: .

---
 wip/todo | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'wip/todo')

diff --git a/wip/todo b/wip/todo
index ca5c298ae..be2a38159 100644
--- a/wip/todo
+++ b/wip/todo
@@ -7,13 +7,13 @@ profile photo to self contact page? - resolve profile photo inconsistency
 	use photo hash to notify of changes?
 
 
-contact editor
-	block photo
+>>>>>>>>contact editor
+>>>>>>>>	block photo
 
-profile "you name it" field
+>>>>>>>>profile "you name it" field
 
 
-group - delete, theme
+group - delete (keep id in acl lists to prvent them from breaking security)
 
 pager - photos
 
@@ -21,13 +21,13 @@ photos/albums/ java uploader
 
 item delete
 
-item edit
+>>>>>>>>item edit
 
 dfrn_poll - import items
 
-local/remote indicator
+>>>>>>>>local/remote indicator
 
-side/text
+>>>>>>>>side/text
 
 
 notififier abstraction
@@ -48,9 +48,9 @@ email
 
 chat
 
-plugin api
+>>>>>>>>plugin api
 
-theme api
+>>>>>>>>theme api
 
 ajax
 
-- 
cgit v1.2.3