fix merge

alexsavio · alexsavio · commit 5c5f72079c03 · 2016-05-31T17:26:10.000+02:00
diff --git a/nipype/__init__.py b/nipype/__init__.py
@@ -18,7 +18,10 @@
 from .fixes.numpy.testing import nosetester
 from .refs import due
 
+<<<<<<< 5129557c96d5481bb93d64e157a0faf4caa729eb
 
+=======
+>>>>>>> fix merge
 try:
     import faulthandler
     faulthandler.enable()
