fixed INSTALL

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/branches/1.2@1062 4979c152-3d1c-0410-bac9-87ea11338e46

1 files changed, 9 insertions, 1 deletions

diff --git a/INSTALL b/INSTALL
index e86d32af..0a4f852e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -100,12 +100,20 @@ b) Make sure to set the section under [globaldbh] to point to the
 central user and session database, using password MYROLEPASSWORD:
 
 [globaldb]
+<<<<<<< .mine
+DBname       = ledgersmb
+DBhost       = localhost
+DBport       = 5432
+DBUserName   = ledgersmb
+DBPassword   = <set me to correct password>
+
+=======
 DBname       = ledgersmb
 DBhost       = localhost
 DBport       = 5432
 DBUserName   = ledgersmb
 DBPassword   = MYROLEPASSWORD
- 
+>>>>>>> .r1061
  
 7) Add configuration to Apache: