resolve conflicts

This commit is contained in:
n3hrox
2019-11-04 20:52:24 +01:00
parent 82b69a5abd
commit 952fee57c1
49 changed files with 360 additions and 322 deletions
+2 -2
View File
@@ -29,7 +29,7 @@ def test_failed_import_url(mocker, caplog, dvc_repo):
assert cmd.run() == 1
expected_error = (
"failed to import http://somesite.com/file_name. "
"You could also try downloading it manually and "
"adding it with `dvc add` command."
"You could also try downloading it manually, and "
"adding it with `dvc add`."
)
assert expected_error in caplog.text