Remove typo from merge conflict
Remove typo from merge conflict

zaxliu/scipy,richardotis/scipy,mgaitan/scipy,surhudm/scipy,aarchiba/scipy,gef756/scipy,fernand/scipy,WillieMaddox/scipy,Eric89GXL/scipy,lukauskas/scipy,person142/scipy,Gillu13/scipy,rmcgibbo/scipy,jjhelmus/scipy,mortonjt/scipy,jamestwebber/scipy,e-q/scipy,fredrikw/scipy,scipy/scipy,scipy/scipy,pbrod/scipy,rgommers/scipy,petebachant/scipy,richardotis/scipy,andyfaff/scipy,jonycgn/scipy,sauliusl/scipy,aeklant/scipy,befelix/scipy,arokem/scipy,petebachant/scipy,mdhaber/scipy,mortada/scipy,giorgiop/scipy,WarrenWeckesser/scipy,kleskjr/scipy,jonycgn/scipy,mdhaber/scipy,dch312/scipy,cpaulik/scipy,sauliusl/scipy,jjhelmus/scipy,tylerjereddy/scipy,pyramania/scipy,cpaulik/scipy,ales-erjavec/scipy,josephcslater/scipy,juliantaylor/scipy,kalvdans/scipy,WillieMaddox/scipy,pnedunuri/scipy,aarchiba/scipy,jamestwebber/scipy,lukauskas/scipy,chatcannon/scipy,trankmichael/scipy,mgaitan/scipy,pnedunuri/scipy,zerothi/scipy,mtrbean/scipy,mdhaber/scipy,sonnyhu/scipy,Newman101/scipy,vberaudi/scipy,anntzer/scipy,zaxliu/scipy,jor-/scipy,nvoron23/scipy,haudren/scipy,arokem/scipy,Dapid/scipy,pschella/scipy,mortada/scipy,andyfaff/scipy,mortonjt/scipy,lhilt/scipy,mdhaber/scipy,e-q/scipy,niknow/scipy,niknow/scipy,behzadnouri/scipy,kleskjr/scipy,jakevdp/scipy,mgaitan/scipy,woodscn/scipy,kalvdans/scipy,raoulbq/scipy,Shaswat27/scipy,jjhelmus/scipy,apbard/scipy,grlee77/scipy,lukauskas/scipy,Srisai85/scipy,mhogg/scipy,pizzathief/scipy,ndchorley/scipy,cpaulik/scipy,jor-/scipy,WillieMaddox/scipy,matthewalbani/scipy,nmayorov/scipy,FRidh/scipy,grlee77/scipy,pnedunuri/scipy,Stefan-Endres/scipy,chatcannon/scipy,nvoron23/scipy,newemailjdm/scipy,zxsted/scipy,behzadnouri/scipy,sauliusl/scipy,josephcslater/scipy,aman-iitj/scipy,apbard/scipy,vigna/scipy,ilayn/scipy,person142/scipy,vigna/scipy,ilayn/scipy,mortonjt/scipy,fernand/scipy,Kamp9/scipy,dominicelse/scipy,aman-iitj/scipy,gfyoung/scipy,Stefan-Endres/scipy,jor-/scipy,chatcannon/scipy,sriki18/scipy,lhilt/scipy,pnedunuri/scipy,fernand/scipy,trankmichael/scipy,lhilt/scipy,Gillu13/scipy,piyush0609/scipy,jsilter/scipy,e-q/scipy,vhaasteren/scipy,nonhermitian/scipy,haudren/scipy,pyramania/scipy,vanpact/scipy,juliantaylor/scipy,Kamp9/scipy,fernand/scipy,giorgiop/scipy,anielsen001/scipy,gef756/scipy,gef756/scipy,ilayn/scipy,futurulus/scipy,haudren/scipy,newemailjdm/scipy,fernand/scipy,zaxliu/scipy,mtrbean/scipy,Newman101/scipy,argriffing/scipy,witcxc/scipy,jsilter/scipy,sauliusl/scipy,behzadnouri/scipy,surhudm/scipy,gfyoung/scipy,woodscn/scipy,njwilson23/scipy,jamestwebber/scipy,befelix/scipy,raoulbq/scipy,pizzathief/scipy,minhlongdo/scipy,ortylp/scipy,anntzer/scipy,mortada/scipy,aman-iitj/scipy,Srisai85/scipy,Newman101/scipy,Srisai85/scipy,maniteja123/scipy,zaxliu/scipy,newemailjdm/scipy,felipebetancur/scipy,maciejkula/scipy,sriki18/scipy,nvoron23/scipy,bkendzior/scipy,zerothi/scipy,Gillu13/scipy,richardotis/scipy,witcxc/scipy,arokem/scipy,anielsen001/scipy,WarrenWeckesser/scipy,cpaulik/scipy,vigna/scipy,trankmichael/scipy,apbard/scipy,ndchorley/scipy,vberaudi/scipy,jsilter/scipy,ChanderG/scipy,grlee77/scipy,felipebetancur/scipy,Shaswat27/scipy,jakevdp/scipy,larsmans/scipy,larsmans/scipy,scipy/scipy,zxsted/scipy,nonhermitian/scipy,mortada/scipy,aman-iitj/scipy,hainm/scipy,Newman101/scipy,mtrbean/scipy,endolith/scipy,jonycgn/scipy,mikebenfield/scipy,mikebenfield/scipy,grlee77/scipy,lukauskas/scipy,ChanderG/scipy,andim/scipy,Shaswat27/scipy,kalvdans/scipy,ortylp/scipy,fredrikw/scipy,gdooper/scipy,pschella/scipy,rgommers/scipy,mtrbean/scipy,bkendzior/scipy,anielsen001/scipy,matthew-brett/scipy,argriffing/scipy,behzadnouri/scipy,mhogg/scipy,woodscn/scipy,andyfaff/scipy,jsilter/scipy,ndchorley/scipy,larsmans/scipy,nonhermitian/scipy,andim/scipy,niknow/scipy,Gillu13/scipy,FRidh/scipy,mingwpy/scipy,aeklant/scipy,pbrod/scipy,arokem/scipy,efiring/scipy,lukauskas/scipy,WarrenWeckesser/scipy,matthew-brett/scipy,nvoron23/scipy,vhaasteren/scipy,jseabold/scipy,hainm/scipy,jor-/scipy,Stefan-Endres/scipy,juliantaylor/scipy,FRidh/scipy,e-q/scipy,argriffing/scipy,ndchorley/scipy,lhilt/scipy,perimosocordiae/scipy,mhogg/scipy,sonnyhu/scipy,newemailjdm/scipy,jsilter/scipy,vhaasteren/scipy,gertingold/scipy,ortylp/scipy,fredrikw/scipy,matthew-brett/scipy,anntzer/scipy,jakevdp/scipy,person142/scipy,sonnyhu/scipy,piyush0609/scipy,Eric89GXL/scipy,haudren/scipy,andim/scipy,giorgiop/scipy,pbrod/scipy,maniteja123/scipy,FRidh/scipy,futurulus/scipy,nvoron23/scipy,jonycgn/scipy,FRidh/scipy,ortylp/scipy,surhudm/scipy,Eric89GXL/scipy,Kamp9/scipy,aarchiba/scipy,ogrisel/scipy,minhlongdo/scipy,futurulus/scipy,Eric89GXL/scipy,bkendzior/scipy,Eric89GXL/scipy,pschella/scipy,mikebenfield/scipy,befelix/scipy,vanpact/scipy,pizzathief/scipy,ChanderG/scipy,ilayn/scipy,maniteja123/scipy,endolith/scipy,vanpact/scipy,nonhermitian/scipy,kleskjr/scipy,apbard/scipy,chatcannon/scipy,Stefan-Endres/scipy,woodscn/scipy,andyfaff/scipy,fernand/scipy,ilayn/scipy,vanpact/scipy,surhudm/scipy,ogrisel/scipy,andyfaff/scipy,rgommers/scipy,FRidh/scipy,jseabold/scipy,Eric89GXL/scipy,mhogg/scipy,aeklant/scipy,Gillu13/scipy,sriki18/scipy,zerothi/scipy,ogrisel/scipy,maniteja123/scipy,ChanderG/scipy,jamestwebber/scipy,maniteja123/scipy,larsmans/scipy,ales-erjavec/scipy,perimosocordiae/scipy,mtrbean/scipy,ndchorley/scipy,zxsted/scipy,ChanderG/scipy,jor-/scipy,endolith/scipy,mortada/scipy,mhogg/scipy,raoulbq/scipy,arokem/scipy,dominicelse/scipy,efiring/scipy,pbrod/scipy,niknow/scipy,vhaasteren/scipy,behzadnouri/scipy,jseabold/scipy,Kamp9/scipy,gdooper/scipy,argriffing/scipy,nmayorov/scipy,tylerjereddy/scipy,andyfaff/scipy,minhlongdo/scipy,perimosocordiae/scipy,dominicelse/scipy,mortonjt/scipy,richardotis/scipy,newemailjdm/scipy,sauliusl/scipy,anntzer/scipy,vhaasteren/scipy,anielsen001/scipy,dch312/scipy,zxsted/scipy,vberaudi/scipy,jseabold/scipy,WillieMaddox/scipy,jjhelmus/scipy,josephcslater/scipy,endolith/scipy,giorgiop/scipy,jjhelmus/scipy,Newman101/scipy,minhlongdo/scipy,gfyoung/scipy,petebachant/scipy,pizzathief/scipy,witcxc/scipy,lhilt/scipy,WarrenWeckesser/scipy,kalvdans/scipy,zerothi/scipy,njwilson23/scipy,nonhermitian/scipy,jakevdp/scipy,aeklant/scipy,mortonjt/scipy,futurulus/scipy,sonnyhu/scipy,ogrisel/scipy,aman-iitj/scipy,larsmans/scipy,petebachant/scipy,hainm/scipy,gertingold/scipy,futurulus/scipy,argriffing/scipy,scipy/scipy,maciejkula/scipy,zxsted/scipy,matthew-brett/scipy,Shaswat27/scipy,sriki18/scipy,piyush0609/scipy,fredrikw/scipy,ales-erjavec/scipy,gdooper/scipy,mgaitan/scipy,Stefan-Endres/scipy,ortylp/scipy,newemailjdm/scipy,haudren/scipy,Srisai85/scipy,josephcslater/scipy,pizzathief/scipy,Dapid/scipy,gfyoung/scipy,dch312/scipy,mdhaber/scipy,vigna/scipy,Dapid/scipy,scipy/scipy,pbrod/scipy,Gillu13/scipy,richardotis/scipy,Dapid/scipy,ales-erjavec/scipy,chatcannon/scipy,maciejkula/scipy,anielsen001/scipy,mikebenfield/scipy,jakevdp/scipy,Kamp9/scipy,person142/scipy,niknow/scipy,person142/scipy,njwilson23/scipy,sonnyhu/scipy,matthewalbani/scipy,pschella/scipy,jonycgn/scipy,ortylp/scipy,maciejkula/scipy,Newman101/scipy,futurulus/scipy,Shaswat27/scipy,ndchorley/scipy,Dapid/scipy,piyush0609/scipy,gef756/scipy,aman-iitj/scipy,gertingold/scipy,zerothi/scipy,ilayn/scipy,zerothi/scipy,efiring/scipy,gdooper/scipy,mingwpy/scipy,efiring/scipy,sriki18/scipy,jamestwebber/scipy,anielsen001/scipy,Shaswat27/scipy,pschella/scipy,anntzer/scipy,mgaitan/scipy,jseabold/scipy,petebachant/scipy,andim/scipy,jonycgn/scipy,gef756/scipy,minhlongdo/scipy,befelix/scipy,Dapid/scipy,rmcgibbo/scipy,bkendzior/scipy,zxsted/scipy,efiring/scipy,endolith/scipy,rgommers/scipy,lukauskas/scipy,larsmans/scipy,rmcgibbo/scipy,zaxliu/scipy,rmcgibbo/scipy,petebachant/scipy,mgaitan/scipy,dominicelse/scipy,woodscn/scipy,mtrbean/scipy,dch312/scipy,surhudm/scipy,mingwpy/scipy,aeklant/scipy,raoulbq/scipy,rmcgibbo/scipy,gertingold/scipy,trankmichael/scipy,giorgiop/scipy,juliantaylor/scipy,kleskjr/scipy,nmayorov/scipy,raoulbq/scipy,trankmichael/scipy,minhlongdo/scipy,ales-erjavec/scipy,juliantaylor/scipy,Stefan-Endres/scipy,fredrikw/scipy,surhudm/scipy,pyramania/scipy,nmayorov/scipy,chatcannon/scipy,piyush0609/scipy,scipy/scipy,vberaudi/scipy,mingwpy/scipy,WarrenWeckesser/scipy,vberaudi/scipy,dominicelse/scipy,richardotis/scipy,perimosocordiae/scipy,mikebenfield/scipy,pnedunuri/scipy,WillieMaddox/scipy,jseabold/scipy,tylerjereddy/scipy,pyramania/scipy,perimosocordiae/scipy,matthew-brett/scipy,argriffing/scipy,mdhaber/scipy,haudren/scipy,piyush0609/scipy,mingwpy/scipy,zaxliu/scipy,tylerjereddy/scipy,dch312/scipy,vberaudi/scipy,fredrikw/scipy,e-q/scipy,niknow/scipy,nvoron23/scipy,maciejkula/scipy,perimosocordiae/scipy,kleskjr/scipy,WillieMaddox/scipy,pbrod/scipy,gfyoung/scipy,giorgiop/scipy,aarchiba/scipy,mhogg/scipy,sonnyhu/scipy,witcxc/scipy,raoulbq/scipy,hainm/scipy,rmcgibbo/scipy,ChanderG/scipy,pyramania/scipy,behzadnouri/scipy,gef756/scipy,felipebetancur/scipy,hainm/scipy,nmayorov/scipy,mingwpy/scipy,vigna/scipy,Srisai85/scipy,woodscn/scipy,Srisai85/scipy,mortonjt/scipy,njwilson23/scipy,matthewalbani/scipy,grlee77/scipy,befelix/scipy,tylerjereddy/scipy,njwilson23/scipy,felipebetancur/scipy,matthewalbani/scipy,vanpact/scipy,vhaasteren/scipy,kleskjr/scipy,Kamp9/scipy,andim/scipy,trankmichael/scipy,gertingold/scipy,ogrisel/scipy,efiring/scipy,gdooper/scipy,bkendzior/scipy,rgommers/scipy,vanpact/scipy,apbard/scipy,sriki18/scipy,matthewalbani/scipy,kalvdans/scipy,josephcslater/scipy,endolith/scipy,aarchiba/scipy,andim/scipy,witcxc/scipy,felipebetancur/scipy,cpaulik/scipy,hainm/scipy,njwilson23/scipy,felipebetancur/scipy,mortada/scipy,maniteja123/scipy,sauliusl/scipy,anntzer/scipy,ales-erjavec/scipy,cpaulik/scipy,pnedunuri/scipy,WarrenWeckesser/scipy