summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/Pg-database.sql3
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 $$