fix merge error

9558629e · Александр · 5cd04906 · 9558629e
Commit 9558629e authored Oct 26, 2012 by Александр
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

common/lib/capa/capa/inputtypes.py
+3 -3

No files found.
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -726,9 +726,6 @@ def crystallography(element, value, status, render_template, msg=''):
    escapedict = {'"': '&quot;'}
    value = saxutils.escape(value, escapedict)

-    molecules = element.get('molecules')
-    geometries = element.get('geometries')
-
    context = {'id': eid,
               'value': value,
               'state': status,
@@ -774,6 +771,9 @@ def vsepr_input(element, value, status, render_template, msg=''):
    escapedict = {'"': '&quot;'}
    value = saxutils.escape(value, escapedict)

+    molecules = element.get('molecules')
+    geometries = element.get('geometries')
+
    context = {'id': eid,
               'value': value,
               'state': status,