This is an automated email from the git hooks/post-receive script. New commit to branch feature/newReportBuilder in repository lima. See http://git.chorem.org/lima.git commit 5c96a75a8e2df5e61828f18753660520b75b8bac Merge: 5007fb8 f852cfd Author: dcosse <japbiw74> Date: Fri Feb 6 17:18:52 2015 +0100 Merge branch 'develop' into feature/newReportBuilder Conflicts: lima-callao/src/main/java/org/chorem/lima/entity/LimaCallaoTopiaPersistenceContext.java lima-swing/src/main/java/org/chorem/lima/ui/BetaLayerUI.java solve conflict .../org/chorem/lima/ui/celleditor/EntryBookTableCellRender.java | 6 +++++- .../chorem/lima/ui/common/FinancialTransactionTableModel.java | 5 ----- .../ui/financialtransaction/FinancialTransactionViewHandler.java | 5 +++++ .../java/org/chorem/lima/ui/lettering/LetteringTableModel.java | 9 +++++++++ 4 files changed, 19 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.