Merge pull request #87 from espressomd/master

Merge the Espresso head
espressomd · Nov 5, 2016 · 4bcfa5d · 4bcfa5d
2 parents 2ae09e8 + e799fdb
commit 4bcfa5d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/python/espressomd/reaction.pyx b/src/python/espressomd/reaction.pyx
@@ -1,7 +1,7 @@
 from __future__ import print_function, absolute_import
 include "myconfig.pxi"
+cimport globals
 from . cimport reaction
-from . cimport globals
 from . cimport utils
 from .highlander import ThereCanOnlyBeOne