Changeset 9ba91b7 in sasview for src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingLogicTest.py

Timestamp:

Sep 7, 2018 10:11:37 AM (6 years ago)

Author:

ibressler

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

254199c

Parents:

d6c4987 (diff), fb560d2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Ingo Breßler <dev@…> (09/07/18 10:09:21)

git-committer:

Ingo Breßler <dev@…> (09/07/18 10:11:37)

Message:

Merge branch 'ESS_GUI' into ESS_GUI_iss1033

• fixed the conflicts introduced by dcabba7b in ESS_GUI

File:

• src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingLogicTest.py (modified) (1 diff)

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingLogicTest.py

@@ -103 +103 @@
                        data, False, None,
                        None, None, None,
-                       None, None)
+                       None)
 
         new_plot = self.logic.new1DPlot(return_data=return_data, tab_id=0)