From d84bdb1bda86929356d218117c4992ab66f2246e Mon Sep 17 00:00:00 2001
From: einhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46>
Date: Tue, 1 Jul 2008 20:56:40 +0000
Subject: Correcting conflict from Aurynn's commit

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@2181 4979c152-3d1c-0410-bac9-87ea11338e46
---
 LedgerSMB/AA.pm | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'LedgerSMB')

diff --git a/LedgerSMB/AA.pm b/LedgerSMB/AA.pm
index 93e64e61..d5d8a1fe 100644
--- a/LedgerSMB/AA.pm
+++ b/LedgerSMB/AA.pm
@@ -311,14 +311,9 @@ sub post_transaction {
         # AR/AP Transaction.
         # ~A
         $query = qq|
-<<<<<<< .mine
-			INSERT INTO $table (invnumber, person_id)
-			     VALUES (?, (select e.id from person p, entity e, users u
-=======
 			INSERT INTO $table (invnumber, person_id, 
 				entity_credit_account)
 			     VALUES (?, (select e.id from person p, entity e, users u
->>>>>>> .r2156
 			                 where u.username = ?
 			                 AND e.id = u.entity_id
 			                 AND p.entity_id = e.id ), ?)|;
-- 
cgit v1.2.3