+ Removed conflict tags... which encompassed the entire file... maybe mixing   Windows and UNIX build worlds is not a good idea... either that, or leaving   it in my hands is a bad idea.
+ Removed conflict tags... which encompassed the entire file... maybe mixing
  Windows and UNIX build worlds is not a good idea... either that, or leaving
  it in my hands is a bad idea.

htcondor/htcondor,bbockelm/condor-network-accounting,htcondor/htcondor,bbockelm/condor-network-accounting,mambelli/osg-bosco-marco,djw8605/condor,htcondor/htcondor,neurodebian/htcondor,djw8605/condor,bbockelm/condor-network-accounting,bbockelm/condor-network-accounting,zhangzhehust/htcondor,bbockelm/condor-network-accounting,htcondor/htcondor,mambelli/osg-bosco-marco,clalancette/condor-dcloud,djw8605/htcondor,djw8605/htcondor,zhangzhehust/htcondor,clalancette/condor-dcloud,djw8605/condor,neurodebian/htcondor,djw8605/htcondor,neurodebian/htcondor,djw8605/condor,htcondor/htcondor,djw8605/htcondor,bbockelm/condor-network-accounting,neurodebian/htcondor,clalancette/condor-dcloud,htcondor/htcondor,htcondor/htcondor,zhangzhehust/htcondor,bbockelm/condor-network-accounting,clalancette/condor-dcloud,djw8605/htcondor,neurodebian/htcondor,zhangzhehust/htcondor,djw8605/condor,mambelli/osg-bosco-marco,htcondor/htcondor,neurodebian/htcondor,mambelli/osg-bosco-marco,djw8605/htcondor,zhangzhehust/htcondor,zhangzhehust/htcondor,djw8605/htcondor,mambelli/osg-bosco-marco,djw8605/condor,neurodebian/htcondor,zhangzhehust/htcondor,mambelli/osg-bosco-marco,neurodebian/htcondor,zhangzhehust/htcondor,zhangzhehust/htcondor,mambelli/osg-bosco-marco,mambelli/osg-bosco-marco,djw8605/condor,djw8605/htcondor,bbockelm/condor-network-accounting,clalancette/condor-dcloud,clalancette/condor-dcloud,clalancette/condor-dcloud,djw8605/condor,djw8605/htcondor,neurodebian/htcondor