SF.net SVN: ledger-smb: [1062] branches/1.2

[..hidden..]

Revision: 1062
          http://svn.sourceforge.net/ledger-smb/?rev=1062&view=rev
Author:   linuxpoet
Date:     2007-04-10 19:42:46 -0700 (Tue, 10 Apr 2007)

Log Message:
-----------
fixed INSTALL

Modified Paths:
--------------
    branches/1.2/Changelog
    branches/1.2/INSTALL

Modified: branches/1.2/Changelog
===================================================================
--- branches/1.2/Changelog	2007-04-10 21:52:31 UTC (rev 1061)
+++ branches/1.2/Changelog	2007-04-11 02:42:46 UTC (rev 1062)
@@ -5,6 +5,7 @@
 * Corrected sales tax display bug in order entry screen (Chris T)
 * Corrected database update unable to connect (Seneca)
 * Corrected login problems on 1.2.1
+* Corrected INSTALL for [GlobalDBH] (Joshua Drake)
 
 Changelog for LedgerSMB 1.2.1
 * Modifed AM.pm to correctly use globals from ledgersmb.conf (Joshua Drake)

Modified: branches/1.2/INSTALL
===================================================================
--- branches/1.2/INSTALL	2007-04-10 21:52:31 UTC (rev 1061)
+++ branches/1.2/INSTALL	2007-04-11 02:42:46 UTC (rev 1062)
@@ -100,13 +100,21 @@
 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:
  
 $ sh configure_apache.sh


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.