From d87d9deba9091e1df3a5a0a09cbfbf2b335ef2de Mon Sep 17 00:00:00 2001
From: chrys <chrys87@web.de>
Date: Tue, 29 Aug 2017 01:10:30 +0200
Subject: [PATCH] TODO

---
 TODO v2.0 | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/TODO v2.0 b/TODO v2.0
index f68113d8..8bc8d793 100644
--- a/TODO v2.0	
+++ b/TODO v2.0	
@@ -20,12 +20,10 @@ Cleanups:
   [] settingsData -> defaultSettings.py
 
 General:  
-<<<<<<< HEAD
-- improve attribute handling
-=======
+- commands
+[] place last spoken to clipboard
 - imporove attribute handling
 [] improve attributes_curr_char
->>>>>>> 1.5
 [] add an attribute sound
 [] beep on cursor/ review by char (capital wins)
 [] beep on review by word (once for multiple, capital wins)