Changeset 146c669 in sasview


Ignore:
Timestamp:
Jul 25, 2017 8:22:07 AM (7 years ago)
Author:
krzywon
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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
ce2819b
Parents:
6a455cd3
Message:

Resolved a merge conflict with a method name change.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sasgui/perspectives/fitting/models.py

    r6a455cd3 r146c669  
    265265        temp = {} 
    266266        if self.is_changed(): 
    267             temp =  _findModels() 
     267            temp =  _find_models() 
    268268            self.last_time_dir_modified = time.time() 
    269269            return temp 
Note: See TracChangeset for help on using the changeset viewer.