From e466870945241c6086828103345d1dc5f9aae839 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Thu, 9 Jul 2009 18:36:35 +0000
Subject: [PATCH] Fix technotes

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8969 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/technotes | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/bacula/technotes b/bacula/technotes
index a4ded2e067..54d57f89a0 100644
--- a/bacula/technotes
+++ b/bacula/technotes
@@ -3,12 +3,9 @@
 General:
 
 09Jul09
-<<<<<<< HEAD:bacula/technotes
+kes  Add --with-hostname to ./configure
 mvw  Changed ACL_OTHER into ACL_OTHER_OBJ as IRIX doesn't seem to have
      ACL_OTHER. Fixes bug #1333
-=======
-kes  Add --with-hostname to ./configure
->>>>>>> Add --with-hostname to ./configure:bacula/technotes
 04Jul09
 mvw  Change checking for acl and xattr support from first file to
      job level.
-- 
2.39.5