(#3139) Fixed merge issue in condor_attributes.h
(#3139) Fixed merge issue in condor_attributes.h

I simply forgot to remove merge line indicator from the file.
The line starting with a couple '<' signs. Fixed it.

djw8605/condor,zhangzhehust/htcondor,djw8605/condor,neurodebian/htcondor,zhangzhehust/htcondor,zhangzhehust/htcondor,neurodebian/htcondor,htcondor/htcondor,djw8605/condor,djw8605/htcondor,neurodebian/htcondor,htcondor/htcondor,htcondor/htcondor,djw8605/htcondor,htcondor/htcondor,htcondor/htcondor,neurodebian/htcondor,djw8605/htcondor,zhangzhehust/htcondor,neurodebian/htcondor,zhangzhehust/htcondor,zhangzhehust/htcondor,djw8605/condor,neurodebian/htcondor,neurodebian/htcondor,htcondor/htcondor,zhangzhehust/htcondor,htcondor/htcondor,djw8605/htcondor,htcondor/htcondor,zhangzhehust/htcondor,djw8605/htcondor,neurodebian/htcondor,djw8605/htcondor,djw8605/htcondor,djw8605/condor,neurodebian/htcondor,djw8605/htcondor,djw8605/condor,djw8605/htcondor,djw8605/condor,djw8605/condor,zhangzhehust/htcondor