summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMS <ms@taler.net>2021-01-29 11:23:16 +0100
committerMS <ms@taler.net>2021-01-29 11:23:16 +0100
commite9037a90a78512a63bbde5a47e479417a72206ec (patch)
treeed34817bb52388fc8ec096bf821aeab36f767f0d
parent536720d058dd267c32b5e386e393dbbe78e40a0d (diff)
downloadlibeufin-timetravel.tar.gz
libeufin-timetravel.tar.bz2
libeufin-timetravel.zip
remove stray linetimetravel
-rwxr-xr-xintegration-tests/tests.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/integration-tests/tests.py b/integration-tests/tests.py
index efc280d1..6805ec4b 100755
--- a/integration-tests/tests.py
+++ b/integration-tests/tests.py
@@ -516,7 +516,6 @@ def test_sandbox_camt():
)
)
-<<<<<<< HEAD
def test_schedule_deletion():
assertResponse(
post("/".join([