Fixed bad conflict resolution

chrisgorgo · chrisgorgo · commit 74f8b78cde7a · 2016-01-31T09:58:18.000-08:00
diff --git a/nipype/pipeline/engine/nodes.py b/nipype/pipeline/engine/nodes.py
@@ -72,7 +72,6 @@
 from .base import EngineBase
 
 
-<<<<<<< HEAD:nipype/pipeline/engine.py
 def _write_inputs(node):
     lines = []
     nodename = node.fullname.replace('.', '_')
