From 8274de5e922f2907b89203f30c0afe7c86af36e6 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Wed, 3 Feb 2010 22:49:02 +0000
Subject: [PATCH] resolve conflicts (Add: --no-new-accounts: don't allow to
 create new accounts)

---
 Commands/Add.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Commands/Add.hs b/Commands/Add.hs
index d7d650960..a320c9624 100644
--- a/Commands/Add.hs
+++ b/Commands/Add.hs
@@ -57,7 +57,7 @@ getTransaction l args = do
         if NoNewAccts `elem` opts
             then isJust $ Foldable.find (== x) ant
             else True
-        where (ant,_,_,_) = groupTransactions . rawLedgerTransactions . rawledger $ l
+        where (ant,_,_,_) = groupPostings . journalPostings . journal $ l
       getpostingsandvalidate = do
         ps <- getPostings accept bestmatchpostings []
         let t = nulltransaction{tdate=date