Ignore:
Timestamp:
Apr 9, 2017 7:28:45 AM (7 years ago)
Author:
butler
Branches:
master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
a9f9ca4
Parents:
7b8e843 (diff), d26f025 (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.
Message:

Merge remote-tracking branch 'origin/master' into ticket-597

Conflicts:

src/sas/sasgui/perspectives/fitting/simfitpage.py

File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/sas/sasgui/perspectives/fitting/simfitpage.py

    r7b8e843 r9b5e70c  
    528528        if not self.batch_on: 
    529529            _PageAnchor = "#simultaneous-fit-mode" 
    530         else:  
     530        else: 
    531531            _PageAnchor = "#combined-batch-fit-mode" 
    532532        _TreeLocation = "user/sasgui/perspectives/fitting/fitting_help.html" 
Note: See TracChangeset for help on using the changeset viewer.