From 4ffd768dbd254da2d1abeba77148ad1de648d117 Mon Sep 17 00:00:00 2001
From: einhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46>
Date: Mon, 7 Jul 2008 02:49:32 +0000
Subject: Correcting svn conflict

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@2189 4979c152-3d1c-0410-bac9-87ea11338e46
---
 sql/Pg-database.sql | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'sql')

diff --git a/sql/Pg-database.sql b/sql/Pg-database.sql
index ef6c4de2..b0b42f8f 100644
--- a/sql/Pg-database.sql
+++ b/sql/Pg-database.sql
@@ -359,12 +359,9 @@ glnumber|1
 projectnumber|1
 queue_payments|0
 poll_frequency|1
-<<<<<<< .mine
 rcptnumber|1
 paynumber|1
-=======
 separate_duties|1
->>>>>>> .r2141
 \.
 
 COMMENT ON TABLE defaults IS $$
-- 
cgit v1.2.3