Fix technotes

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

diff --git a/bacula/technotes b/bacula/technotes
index a4ded2e0677a1026e43675c9d0836685f8eb1c2e..54d57f89a0a427ff770950cb7b7894168f1d2a98 100644 (file)
--- 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.