Changeset 5ab99b7 in sasmodels


Ignore:
Timestamp:
Jan 3, 2018 9:47:51 PM (6 years ago)
Author:
Paul Kienzle <pkienzle@…>
Children:
d5014e4
Parents:
a6d3f46
Message:

remove merge cruft: same line in two places

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/modelinfo.py

    rc01ed3e r5ab99b7  
    794794    info.structure_factor = getattr(kernel_module, 'structure_factor', False) 
    795795    info.profile_axes = getattr(kernel_module, 'profile_axes', ['x', 'y']) 
    796     info.c_code = getattr(kernel_module, 'c_code', None) 
    797796    info.source = getattr(kernel_module, 'source', []) 
    798797    info.c_code = getattr(kernel_module, 'c_code', None) 
Note: See TracChangeset for help on using the changeset viewer.