From 03abd10d1ee08df945bb7c3a38e1b9de5071f890 Mon Sep 17 00:00:00 2001
From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 29 Sep 2005 10:35:29 +0000
Subject: [PATCH] Fixed TODO

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@1441 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 TODO | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/TODO b/TODO
index 2f558c7e8..6beeeeccf 100644
--- a/TODO
+++ b/TODO
@@ -51,19 +51,15 @@ Things to fix before 2.4:
 
 * Saving of initially created gofon stuff fails
 
-<<<<<<< .mine
 * %telephoneNumber is not filled
-=======
+
 * Unterbäume in Applicatins wird nicht angezeigt
->>>>>>> .r1434
 
-<<<<<<< .mine
 * lifetime must be numeric - wirklich toll
-=======
+
 * Terminals/Workstations lassen sich nicht speichern
->>>>>>> .r1434
 
-<<<<<<< .mine
+* Escapen von Skripten ist sehr suboptimal
 
 
 =======
@@ -71,7 +67,7 @@ Things to fix before 2.4:
 
 * Workstation is defekt
 
->>>>>>> .r1434
+
 Target for 2.5:
 ===============
 
-- 
2.30.2