From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 22 Oct 2005 15:06:32 +0000 (+0000)
Subject: Fix kernstodo conflict
X-Git-Tag: Release-1.38.0~42
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5f1db279cbca400a4181615100833e537eefac5b;p=bacula%2Fbacula

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 b225365d17..1b77fdc605 100644
--- 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.