From 0068ef8f678ac97c37f7dadc6053e75aedca8d63 Mon Sep 17 00:00:00 2001
From: Lars Hvam <larshp@hotmail.com>
Date: Fri, 4 Jul 2014 13:35:07 +0200
Subject: [PATCH] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 3300dbfab..7de130319 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,7 @@ Todo
 - license?
 - injection?
 - shallow/deepen?
+- handling conflicts
 
 ---