amend sloppy merge

Author: oesteban

nipype/interfaces/base.py

@@ -30,13 +30,9 @@
 import time
 from textwrap import wrap
 from warnings import warn
-<<<<<<< HEAD
 import simplejson as json
-=======
 from dateutil.parser import parse as parseutc
 
->>>>>>> upstream/master
-
 from .. import config, logging, LooseVersion, __version__
 from ..utils.provenance import write_provenance
 from ..utils.misc import is_container, trim, str2bool