Remove conflict file
Remove conflict file

- Not sure how this ever was committed; removed now

guliano/zf-apigility-admin,ildanno/zf-apigility-admin,gartner/zf-apigility-admin,jguittard/zf-apigility-admin,ildanno/zf-apigility-admin,gartner/zf-apigility-admin,jguittard/zf-apigility-admin,guliano/zf-apigility-admin