SF.net SVN: ledger-smb: [2189] trunk/sql/Pg-database.sql

[..hidden..]

Revision: 2189
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=2189&view=rev
Author:   einhverfr
Date:     2008-07-06 19:49:32 -0700 (Sun, 06 Jul 2008)

Log Message:
-----------
Correcting svn conflict

Modified Paths:
--------------
    trunk/sql/Pg-database.sql

Modified: trunk/sql/Pg-database.sql
===================================================================
--- trunk/sql/Pg-database.sql	2008-07-05 22:54:46 UTC (rev 2188)
+++ trunk/sql/Pg-database.sql	2008-07-07 02:49:32 UTC (rev 2189)
@@ -359,12 +359,9 @@
 projectnumber|1
 queue_payments|0
 poll_frequency|1
-<<<<<<< .mine
 rcptnumber|1
 paynumber|1
-=======
 separate_duties|1
->>>>>>> .r2141
 \.
 
 COMMENT ON TABLE defaults IS $$


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