Changeset 18d732c in sasmodels for sasmodels/models/triaxial_ellipsoid.py


Ignore:
Timestamp:
Apr 8, 2017 5:29:21 AM (7 years ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
Children:
0881f4e
Parents:
afd4692 (diff), 737679d (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 branch 'ticket-890' of github.com:sasview/sasmodels into ticket-890

File:
1 edited

Legend:

Unmodified
Added
Removed

  • sasmodels/models/triaxial_ellipsoid.py

    rafd4692 r18d732c  
    117117* **Author:** NIST IGOR/DANSE **Date:** pre 2010 
    118118* **Last Modified by:** Paul Kienzle (improved calculation) **Date:** April 4, 2017 
     119<<<<<<< HEAD 
     120* **Last Reviewed by:** Paul Kienzle &Richard Heenan **Date:**  April 4, 2017 
     121======= 
    119122* **Last Reviewed by:** Paul Kienzle & Richard Heenan **Date:**  April 4, 2017 
     123>>>>>>> 3fd04991e2575b02401723d8534c376cd9b66305 
    120124 
    121125""" 
Note: See TracChangeset for help on using the changeset viewer.