Changeset 0881f4e in sasmodels for sasmodels/models/triaxial_ellipsoid.py


Ignore:
Timestamp:
Apr 8, 2017 5:33:25 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:
f3073b0
Parents:
18d732c
Message:

clean up merge droppings

File:
1 edited

Legend:

Unmodified
Added
Removed

  • sasmodels/models/triaxial_ellipsoid.py

    r18d732c r0881f4e  
    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 ======= 
    122119* **Last Reviewed by:** Paul Kienzle & Richard Heenan **Date:**  April 4, 2017 
    123 >>>>>>> 3fd04991e2575b02401723d8534c376cd9b66305 
    124  
    125120""" 
    126121 
Note: See TracChangeset for help on using the changeset viewer.