edited a test_ccddata.py to remove merging conflicts#
edited a test_ccddata.py to remove merging conflicts#

crawfordsm/ccdproc,evertrol/ccdproc,mwcraig/ccdproc,pulsestaysconstant/ccdproc,indiajoe/ccdproc,astropy/ccdproc