IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix broken merges

Browse Source
This commit is contained in:
Takeshi KOMIYA 2016-03-03 23:14:16 +09:00
parent dda98c7d53
commit f33e25dbad
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/test_intl.py
View File

@ -789,7 +789,6 @@ def test_additional_targets_should_be_translated(app, status, warning):
yield assert_count(expected_expr, result, 1) yield assert_count(expected_expr, result, 1)
<<<<<<< HEAD
@gen_with_intl_app('text', freshenv=True) @gen_with_intl_app('text', freshenv=True)
def test_references(app, status, warning): def test_references(app, status, warning):
app.builder.build_specific([app.srcdir / 'refs.txt']) app.builder.build_specific([app.srcdir / 'refs.txt'])