2 files changed, 10 insertions, 1 deletions
diff --git a/Changelog b/Changelog
index f47d42e4..68a2fd85 100644
--- a/Changelog
+++ b/Changelog
@@ -5,6 +5,7 @@ Changelog for 1.2.2
 * 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)
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: