Ignore:
Timestamp:
Mar 30, 2019 6:15:53 PM (6 years ago)
Author:
GitHub <noreply@…>
Parents:
d4cde37 (diff), 0e0c645 (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:
Jeff Krzywon <krzywon@…> (03/30/19 18:15:53)
git-committer:
GitHub <noreply@…> (03/30/19 18:15:53)
Message:

Merge 0e0c645bd0457e2a1f474d1abf25ea989689caf6 into d4cde3775cc19e3e8ac413babb90e5015eb330e7

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sascalc/dataloader/data_info.py

    r8c9e65c rcc2cd5a  
    11911191        final_dataset.yaxis(data._yaxis, data._yunit) 
    11921192        final_dataset.zaxis(data._zaxis, data._zunit) 
    1193         final_dataset.y_bins = data.y_bins 
    1194         final_dataset.x_bins = data.x_bins 
    11951193    else: 
    11961194        return_string = ("Should Never Happen: _combine_data_info_with_plottabl" 
Note: See TracChangeset for help on using the changeset viewer.