From f33e25dbad1c49f10624c3ddb69070c4855caa1e Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Thu, 3 Mar 2016 23:14:16 +0900 Subject: [PATCH] Fix broken merges --- tests/test_intl.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/test_intl.py b/tests/test_intl.py index a2b4f0e3b..e82d9f3ed 100644 --- a/tests/test_intl.py +++ b/tests/test_intl.py @@ -789,7 +789,6 @@ def test_additional_targets_should_be_translated(app, status, warning): yield assert_count(expected_expr, result, 1) -<<<<<<< HEAD @gen_with_intl_app('text', freshenv=True) def test_references(app, status, warning): app.builder.build_specific([app.srcdir / 'refs.txt'])