fix merge conflict in CHANGES

beOn · beOn · commit d47ff540061c · 2013-09-30T12:51:56.000-05:00
Conflicts:
	CHANGES
diff --git a/CHANGES b/CHANGES
@@ -3,6 +3,7 @@ Next release
 
 * ENH: SelectFiles: a streamlined version of DataGrabber
 * ENH: New interfaces: spm.ResliceToReference, FuzzyOverlap, afni.AFNItoNIFTI
+       spm.DicomImport
 * ENH: W3C PROV support with optional RDF export built into Nipype
 
 * FIX: Deals properly with 3d files in SPM Realign
