mainbiblio.bib : get rid of merge marker from failed merge
mainbiblio.bib : get rid of merge marker from failed merge

 Thanks to Tom Prince for spotting this

git-svn-id: 44dc50bdcc0f5d1a212c497508dc9452e0b35e2b@14530 85f007b7-540e-0410-9357-904b9bb8a0f7

aspiwack/coq,jpdeplaix/coq,Zimmi48/coq,william-lawvere/coq,ppedrot/coq,jhjourdan/coq,pirapira/coq2rust,Lionel-Rieg/coq,asr/coq,TOSPIO/coq,jpdeplaix/coq,Matafou/coq,shindere/coq,ale-f/coq,Matafou/coq,jpdeplaix/coq,letouzey/coq-wip,coq/coq,TOSPIO/coq,maximedenes/coq,aspiwack/coq,herbelin/github-coq,Lionel-Rieg/coq,8l/coq,pirbo/coq,Lionel-Rieg/coq,coq/coq,maximedenes/coq,pirbo/coq,Ptival/coq,gmalecha/coq,gmalecha/coq,jhjourdan/coq,shindere/coq,gares/coq,SkySkimmer/coq,TheTypoMaster/coq,silene/coq,aspiwack/coq,ejgallego/coq,jhjourdan/coq,amintimany/coq,JasonGross/coq,TheTypoMaster/coq,gares/coq,Zimmi48/coq,ejgallego/coq,letouzey/coq-wip,8l/coq,ale-f/coq,amintimany/coq,ppedrot/coq,TheTypoMaster/coq,ppedrot/coq,shindere/coq,coq/coq,JasonGross/coq,coq/coq,herbelin/github-coq,mattam82/coq,mattam82/coq,ejgallego/coq,pirapira/coq2rust,barras/coq,letouzey/coq-wip,Matafou/coq,pirbo/coq,barras/coq,JasonGross/coq,william-lawvere/coq,silene/coq,SkySkimmer/coq,gares/coq,silene/coq,mattam82/coq,Zimmi48/coq,gares/coq,ppedrot/coq,ejgallego/coq,8l/coq,mlasson/coq,gmalecha/coq,maximedenes/coq,gares/coq,william-lawvere/coq,ppedrot/coq,Zimmi48/coq,SkySkimmer/coq,mlasson/coq,barras/coq,SkySkimmer/coq,asr/coq,maximedenes/coq,letouzey/coq-wip,ale-f/coq,amintimany/coq,pirapira/coq2rust,Ptival/coq,asr/coq,TOSPIO/coq,JasonGross/coq,maximedenes/coq,letouzey/coq-wip,Ptival/coq,herbelin/github-coq,mlasson/coq