From 46f16aa1139a6e739045cfdcc2ff85c48603e117 Mon Sep 17 00:00:00 2001
From: Andrei Savici <saviciat@ornl.gov>
Date: Tue, 11 Aug 2015 17:18:30 -0400
Subject: [PATCH] Resolve conflicts. Refs #12661
---
.../SystemTests/tests/analysis/EQSANSDarkCurrentAPIv2.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSDarkCurrentAPIv2.py b/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSDarkCurrentAPIv2.py
index 561b98ef6b6..6a12f0209ee 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSDarkCurrentAPIv2.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSDarkCurrentAPIv2.py
@@ -19,8 +19,8 @@ class EQSANSDarkCurrent(stresstesting.MantidStressTest):
def runTest(self):
- config = ConfigService.Instance()
- config["facilityName"]='SNS'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='SNS'
# The new version of dark current subtraction only works on histograms
EQSANS(False)
SolidAngle()
--
GitLab