Update including explicit steps to resolve conflicts.
Update including explicit steps to resolve conflicts.
PsichiX/linguist,tschf/linguist,meunierfrederic/octocatlinguist,kyoungrok0517/linguist,BerkeleyTrue/linguist,jrnold/linguist,ilyes14/linguist,ammaraskar/linguist,tschf/linguist,github/linguist,christop/linguist,meunierfrederic/octocatlinguist,CoderXpert/linguist,adamkaplan/linguist,stanhu/linguist,marcojonker/test,jrnold/linguist,iblech/linguist,mattn/linguist,hcatlin/linguist,cokeboL/linguist,Mx7f/linguist,JJ/linguist,kr/linguist,manveru/linguist,FStarLang/linguist,kr/linguist,whitj00/linguist,alvarotrigo/linguist,scttnlsn/linguist,alvarotrigo/linguist,yyx990803/linguist,c-lipka/linguist,osorgin/linguist,Mx7f/linguist,R4PaSs/linguist,a0viedo/linguist,marcojonker/test,pchaigno/linguist,mattn/linguist,mcandre/linguist,davidzchen/linguist,bluebear94/linguist,sideci-sample/sideci-sample-linguist,stanhu/linguist,seanders/linguist,iblech/linguist,a0viedo/linguist,cybernet14/linguist,chiranjeevjain/linguist,wcandillon/linguist,davidzchen/linguist,seanders/linguist,github/linguist,yyx990803/linguist,ya7lelkom/linguist,mcandre/linguist,scttnlsn/linguist,kyoungrok0517/linguist,steventhanna/linguist,yyx990803/linguist,anhongyue/test222,JJ/linguist,whitj00/linguist,christop/linguist,ammaraskar/linguist,yyx990803/linguist,anhongyue/test222,cybernet14/linguist,meunierfrederic/octocatlinguist,jtbandes/linguist,alitalia/linguist,MostAwesomeDude/linguist,phpsgi/linguist,thejameskyle/linguist,PsichiX/linguist,MadcapJake/linguist,alitalia/linguist,github/linguist,jtbandes/linguist,github/linguist,martynbm/linguist,BerkeleyTrue/linguist,ppaulweber/github-linguist,hcutler/linguist,c-lipka/linguist,wcandillon/linguist,osorgin/linguist,pcantrell/linguist,erkyrath/linguist,assimovt/ling-ist,stanhu/linguist,steventhanna/linguist,JJ/linguist,ya7lelkom/linguist,adamkaplan/linguist,CoderXpert/linguist,erkyrath/linguist,SRI-CSL/linguist,CegepVictoriaville/linguist,SRI-CSL/linguist,stanhu/linguist,MostAwesomeDude/linguist,ppaulweber/github-linguist,JJ/linguist,sagar290/linguist,sebgod/linguist,R4PaSs/linguist,FStarLang/linguist,MadcapJake/linguist,yscho/linguist,manveru/linguist,georgesuperman/linguist,pcantrell/linguist,douglas-larocca/linguist,erkyrath/linguist,assimovt/ling-ist,pchaigno/linguist,Rockyspade/linguist,cokeboL/linguist,phpsgi/linguist,jjatria/linguist,CegepVictoriaville/linguist,nburkley/linguist,hcutler/linguist,hcatlin/linguist,mwpastore/linguist,MahmoudFayed/linguist,ilyes14/linguist,nburkley/linguist,matt40k/linguist,mwpastore/linguist,pchaigno/linguist,sebgod/linguist,jjatria/linguist,douglas-larocca/linguist,yscho/linguist,georgesuperman/linguist,chiranjeevjain/linguist,pchaigno/linguist,sagar290/linguist,MahmoudFayed/linguist,sideci-sample/sideci-sample-linguist,Rockyspade/linguist,bluebear94/linguist,sebgod/linguist,erkyrath/linguist,thejameskyle/linguist,sebgod/linguist,matt40k/linguist,martynbm/linguist