Fix kernstodo conflict

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2475 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/kernstodo b/bacula/kernstodo
index b225365d17ec57e68294b0400e947783a8099ad5..1b77fdc6053f7d391a5f06699d3279ec16f29152 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -50,16 +50,12 @@ Document:
 - Does WildFile match against full name?  Doc.
 
 For 1.39:
-<<<<<<< kernstodo
 - Add binary tree search for tree routines.
-- Eliminate use of column positions in wx-console.
-=======
 - Add a new Autochanger directive "Global lock = yes|no"
   that provides a global lock on calling mtx-changer so
   that multiple autochanger definitions can reference
   the same physical autochanger.
 - Look at -D_FORTIFY_SOURCE=2
->>>>>>> 1.576
 - Close STDOUT if debug_level == 0
 - Add recycle event.
 - Add scratch pool event.