From b490ad3093add73e06356a96a77f64ab274c72f7 Mon Sep 17 00:00:00 2001
From: src386 <soyouz@src386.org>
Date: Wed, 12 Aug 2015 12:15:55 +0200
Subject: [PATCH] 0.2b

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

diff --git a/TODO b/TODO
index 4985620..c92d4c1 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1 @@
-<<<<<<< HEAD
 - Add SSO support
-=======
->>>>>>> master