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

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:

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

sasmodels/models/sc_paracrystal.py

@@ -83 +83 @@
 model computation.
 
-<<<<<<< HEAD
 .. figure:: img/parallelepiped_angle_definition.png
 
-    Orientation of the crystal with respect to the scattering plane, when 
+    Orientation of the crystal with respect to the scattering plane, when
     $\theta = \phi = 0$ the $c$ axis is along the beam direction (the $z$ axis).
-=======
-.. figure:: img/sc_crystal_angle_definition.jpg
->>>>>>> 3fd04991e2575b02401723d8534c376cd9b66305
 
 Reference