Skip to content

Commit 3aa44c0

Browse files
committed
Fix conflicts
1 parent f189901 commit 3aa44c0

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

nipype/interfaces/base.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -758,17 +758,12 @@ def _get_trait_desc(self, inputs, name, spec):
758758
manhelpstr = ['\t%s' % name]
759759

760760
type_info = spec.full_info(inputs, name, None)
761-
<<<<<<< HEAD
762-
default = ', nipype default value: %s' % spec.default_value()[1]
763-
line = "(%s%s)" % (type_info, default if spec.usedefault else '')
764-
=======
765-
default = ''
766761

762+
default = ''
767763
if spec.usedefault:
768764
default = ', nipype default value: %s' % str(spec.default_value()[1])
769-
770765
line = "(%s%s)" % (type_info, default)
771-
>>>>>>> master
766+
772767
manhelpstr = wrap(line, 70,
773768
initial_indent=manhelpstr[0]+': ',
774769
subsequent_indent='\t\t ')

0 commit comments

Comments
 (0)