From 6d8d7c392464fd03b12202db80e2264c22ba2259 Mon Sep 17 00:00:00 2001
From: Nick Draper <nick.draper@stfc.ac.uk>
Date: Tue, 31 Mar 2020 09:56:47 +0100
Subject: [PATCH] fix a conflict resolution mistake I made
---
qt/python/mantidqt/utils/test/test_async.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/qt/python/mantidqt/utils/test/test_async.py b/qt/python/mantidqt/utils/test/test_async.py
index 84af30523f2..6d69ad2508f 100644
--- a/qt/python/mantidqt/utils/test/test_async.py
+++ b/qt/python/mantidqt/utils/test/test_async.py
@@ -106,7 +106,7 @@ class AsyncTaskTest(unittest.TestCase):
self.assertEqual(2, len(recv.task_exc_stack))
# line number of self.target in asynchronous.py
- self.assertEqual(68, recv.task_exc_stack[0][1])
+ self.assertEqual(65, recv.task_exc_stack[0][1])
# line number of raise statement above
self.assertEqual(93, recv.task_exc_stack[1][1])
--
GitLab