Clean up a merge conflict in repositories doc
Clean up a merge conflict in repositories doc

A merge conflict slipped through recently, corrupting the page a bit.
pierredup/composer,staabm/composer,fabpot/composer,dzuelke/composer,balbuf/composer,stof/composer,till/composer,curry684/composer,localheinz/composer,alcohol/composer,remicollet/composer,erasys/composer,johnstevenson/composer,floverdevel/composer,naderman/composer,composer/composer,jreinke/composer,vdm-io/composer,hirak/composer,milleruk/composer,slbmeh/composer,fabiang/composer,andrerom/composer,nicolas-grekas/composer,SpacePossum/composer,stefangr/composer,gencer/composer,MoT3rror/composer