fix conflicts

Author: josephmje

nipype/interfaces/fsl/tests/test_auto_Eddy.py

@@ -95,6 +95,7 @@ def test_Eddy_inputs():
 
 def test_Eddy_outputs():
     output_map = dict(
+<<<<<<< HEAD
         out_cnr_maps=dict(extensions=None,),
         out_corrected=dict(extensions=None,),
         out_movement_over_time=dict(extensions=None,),
@@ -110,6 +111,23 @@ def test_Eddy_outputs():
         out_rotated_bvecs=dict(extensions=None,),
         out_shell_alignment_parameters=dict(extensions=None,),
         out_shell_pe_translation_parameters=dict(extensions=None,),
+=======
+        out_cnr_maps=dict(extensions=None, ),
+        out_corrected=dict(extensions=None, ),
+        out_movement_over_time=dict(extensions=None, ),
+        out_movement_rms=dict(extensions=None, ),
+        out_outlier_free=dict(extensions=None, ),
+        out_outlier_map=dict(extensions=None, ),
+        out_outlier_n_sqr_stdev_map=dict(extensions=None, ),
+        out_outlier_n_stdev_map=dict(extensions=None, ),
+        out_outlier_report=dict(extensions=None, ),
+        out_parameter=dict(extensions=None, ),
+        out_residuals=dict(extensions=None, ),
+        out_restricted_movement_rms=dict(extensions=None, ),
+        out_rotated_bvecs=dict(extensions=None, ),
+        out_shell_alignment_parameters=dict(extensions=None, ),
+        out_shell_pe_translation_parameters=dict(extensions=None, ),
+>>>>>>> 9d91495a79d81fc2cf31280566fd93cd28bf1158
     )
     outputs = Eddy.output_spec()