diff options
| author | einhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46> | 2008-07-07 02:49:32 +0000 |
|---|---|---|
| committer | einhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46> | 2008-07-07 02:49:32 +0000 |
| commit | 4ffd768dbd254da2d1abeba77148ad1de648d117 (patch) | |
| tree | 64fa4ca947ef9bf6d4edb22dc15b51a3ec321f61 /sql | |
| parent | 05607cb1da71edc2332874b5ddace9cc430ee3f3 (diff) | |
Correcting svn conflict
git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@2189 4979c152-3d1c-0410-bac9-87ea11338e46
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/Pg-database.sql | 3 |
1 files changed, 0 insertions, 3 deletions
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 $$ |