Resolve conflicts

diff --git a/zebra/README b/zebra/README
index af38aa6..11bcb0d 100644 (file)
--- a/zebra/README
+++ b/zebra/README
@@ -106,7 +106,7 @@ or:
 tar xzf records-2007-04-18.tar.gz
 zebraidx-2.0 init
 zebraidx-2.0 update zeerex.xml
-zebraidx-2.0 update records-2010-04-06
+zebraidx-2.0 update records-2010-04-20
 zebraidx-2.0 commit
 
 zebrasrv-2.0 -f yazserver.xml

diff --git a/zebra/zebra.cfg b/zebra/zebra.cfg
index 78f0cc4..0527644 100644 (file)
--- a/zebra/zebra.cfg
+++ b/zebra/zebra.cfg
@@ -1,12 +1,11 @@
 
 # Where to look for config files
-profilePath: .:/usr/local/share/idzebra-2.0/tab:/usr/share/idzebra-2.0/tab:/opt/local/share/idzebra-2.0/tab:/usr/share/idzebra-2.0/tab
+profilePath: .:/usr/share/idzebra-2.0/tab:/opt/local/share/idzebra-2.0/tab:/usr/local/Cellar/zebra/2.0.59/share/idzebra-2.0/tab
 
 # Where to look for loadable zebra modules.  Both these path components
 # are necessary, since the former is used when installed from a Debian
 # package and the latter when installed from a Mac port.
-modulePath: /usr/lib/idzebra-2.0/modules:/opt/local/lib/idzebra-2.0/modules
-#modulePath: /usr/local/lib/idzebra-2.0/modules
+modulePath: /usr/lib/idzebra-2.0/modules:/opt/local/lib/idzebra-2.0/modules:/usr/local/Cellar/zebra/2.0.59/lib/idzebra-2.0/modules
 
 # store records and record keys internally
 storeData: 1