Changeset 49fe9d5 in sasmodels

Timestamp:

Feb 16, 2016 8:19:33 AM (9 years ago)

Author:

Doucet, Mathieu <doucetm@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

a8b3cdb

Parents:

8c9dbc9 (diff), 2c1cd96 (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 'master' of ​https://github.com/SasView/sasmodels

Conflicts:

sasmodels/models/core_shell_sphere.py

File:

• sasmodels/models/core_shell_sphere.py (modified) (1 diff)

sasmodels/models/core_shell_sphere.py

@@ -108 +108 @@
            'solvent_sld':3.0,
            'background':0.0
-          }, 0.4, 0.000698838],
-         ]
+          }, 0.4, 0.000698838]]