From aed71450efb48f9e3eb503011db1ed8892bff555 Mon Sep 17 00:00:00 2001 From: "Laurent Mignon (aka lmi)" Date: Wed, 6 Aug 2014 16:20:11 +0200 Subject: [PATCH] [FIX] conflicts incorrectly resolved when merging upstream/7.0 --- account_statement_base_completion/tests/test_base_completion.py | 1 - 1 file changed, 1 deletion(-) diff --git a/account_statement_base_completion/tests/test_base_completion.py b/account_statement_base_completion/tests/test_base_completion.py index 40dbf6ef..acbabbb0 100644 --- a/account_statement_base_completion/tests/test_base_completion.py +++ b/account_statement_base_completion/tests/test_base_completion.py @@ -118,4 +118,3 @@ class base_completion(common.TransactionCase): self.partner_id, statement_line.partner_id['id'], "Partner id should be empty after completion(partner_name: " "%s, line_name: %s)" % (case.partner_name, case.line_label)) -