updated CHANGES and add space to dti.py

Author: mattfeld

CHANGES

@@ -1,5 +1,6 @@
 Next release
 ============
+<<<<<<< HEAD
 
 * FIX: Enable absolute path definitions in DCMStack (https://github.com/nipy/nipype/pull/1089,
        replaced by https://github.com/nipy/nipype/pull/1093)
@@ -12,6 +13,7 @@ Next release
 * FIX: FUGUE is now properly listing outputs. (https://github.com/nipy/nipype/pull/978)
 * ENH: Improved FieldMap-Based (FMB) workflow for correction of susceptibility distortions in EPI seqs.
        (https://github.com/nipy/nipype/pull/1019)
+* FIX: In the FSLXcommand _list_outputs function fixed for loop range (https://github.com/nipy/nipype/pull/1071)
 * ENH: Dropped support for now 7 years old Python 2.6 (https://github.com/nipy/nipype/pull/1069)
 * FIX: terminal_output is not mandatory anymore (https://github.com/nipy/nipype/pull/1070)
 * ENH: Added "nipype_cmd" tool for running interfaces from the command line (https://github.com/nipy/nipype/pull/795)

nipype/interfaces/fsl/dti.py

@@ -222,7 +222,7 @@ def _list_outputs(self):
         for k in multi_out:
             outputs[k] = []
 
-       for i in xrange(1, self.inputs.n_fibres + 1):
+        for i in xrange(1, self.inputs.n_fibres + 1):
             outputs['fsamples'].append(self._gen_fname('f%dsamples' % i,
                                        cwd=out_dir))
             outputs['mean_fsamples'].append(self._gen_fname(('mean_f%d'