Recover from a bad merge.
Recover from a bad merge.

rdar://25732692

danielmartin/swift,brentdax/swift,kstaring/swift,shahmishal/swift,rudkx/swift,gottesmm/swift,kperryua/swift,glessard/swift,milseman/swift,austinzheng/swift,aschwaighofer/swift,airspeedswift/swift,lorentey/swift,harlanhaskins/swift,roambotics/swift,sschiau/swift,modocache/swift,tkremenek/swift,codestergit/swift,harlanhaskins/swift,xedin/swift,jopamer/swift,benlangmuir/swift,gottesmm/swift,swiftix/swift,karwa/swift,gribozavr/swift,gribozavr/swift,karwa/swift,IngmarStein/swift,Jnosh/swift,kperryua/swift,return/swift,practicalswift/swift,frootloops/swift,rudkx/swift,tkremenek/swift,deyton/swift,shahmishal/swift,calebd/swift,JaSpa/swift,tkremenek/swift,rudkx/swift,kstaring/swift,deyton/swift,alblue/swift,airspeedswift/swift,shajrawi/swift,gottesmm/swift,huonw/swift,huonw/swift,huonw/swift,Jnosh/swift,alblue/swift,codestergit/swift,apple/swift,bitjammer/swift,gribozavr/swift,xwu/swift,devincoughlin/swift,shahmishal/swift,parkera/swift,return/swift,kstaring/swift,therealbnut/swift,tjw/swift,atrick/swift,JaSpa/swift,Jnosh/swift,karwa/swift,hooman/swift,felix91gr/swift,stephentyrone/swift,IngmarStein/swift,practicalswift/swift,swiftix/swift,brentdax/swift,shajrawi/swift,allevato/swift,therealbnut/swift,felix91gr/swift,hooman/swift,frootloops/swift,harlanhaskins/swift,gribozavr/swift,tkremenek/swift,danielmartin/swift,tardieu/swift,hooman/swift,roambotics/swift,allevato/swift,lorentey/swift,arvedviehweger/swift,tardieu/swift,brentdax/swift,practicalswift/swift,tjw/swift,djwbrown/swift,therealbnut/swift,CodaFi/swift,glessard/swift,JGiola/swift,CodaFi/swift,gregomni/swift,amraboelela/swift,sschiau/swift,austinzheng/swift,amraboelela/swift,allevato/swift,codestergit/swift,xedin/swift,natecook1000/swift,karwa/swift,glessard/swift,arvedviehweger/swift,uasys/swift,amraboelela/swift,deyton/swift,return/swift,zisko/swift,huonw/swift,parkera/swift,Jnosh/swift,OscarSwanros/swift,ben-ng/swift,gregomni/swift,jmgc/swift,aschwaighofer/swift,jtbandes/swift,amraboelela/swift,jmgc/swift,zisko/swift,Jnosh/swift,tinysun212/swift-windows,karwa/swift,milseman/swift,xwu/swift,felix91gr/swift,gottesmm/swift,djwbrown/swift,austinzheng/swift,Jnosh/swift,ben-ng/swift,swiftix/swift,kperryua/swift,frootloops/swift,deyton/swift,calebd/swift,frootloops/swift,kstaring/swift,allevato/swift,gottesmm/swift,alblue/swift,ahoppen/swift,practicalswift/swift,felix91gr/swift,hughbe/swift,jmgc/swift,apple/swift,CodaFi/swift,danielmartin/swift,gottesmm/swift,tinysun212/swift-windows,nathawes/swift,benlangmuir/swift,ahoppen/swift,swiftix/swift,airspeedswift/swift,alblue/swift,benlangmuir/swift,bitjammer/swift,practicalswift/swift,jtbandes/swift,kperryua/swift,codestergit/swift,tinysun212/swift-windows,jtbandes/swift,devincoughlin/swift,ben-ng/swift,frootloops/swift,huonw/swift,jopamer/swift,codestergit/swift,manavgabhawala/swift,austinzheng/swift,austinzheng/swift,jmgc/swift,uasys/swift,roambotics/swift,ahoppen/swift,sschiau/swift,natecook1000/swift,uasys/swift,shahmishal/swift,shajrawi/swift,alblue/swift,uasys/swift,apple/swift,modocache/swift,stephentyrone/swift,milseman/swift,return/swift,bitjammer/swift,IngmarStein/swift,amraboelela/swift,rudkx/swift,stephentyrone/swift,calebd/swift,amraboelela/swift,aschwaighofer/swift,aschwaighofer/swift,gmilos/swift,gmilos/swift,karwa/swift,nathawes/swift,CodaFi/swift,gribozavr/swift,apple/swift,allevato/swift,tinysun212/swift-windows,roambotics/swift,bitjammer/swift,jopamer/swift,jtbandes/swift,tjw/swift,xedin/swift,brentdax/swift,sschiau/swift,tardieu/swift,xedin/swift,tardieu/swift,devincoughlin/swift,brentdax/swift,JaSpa/swift,milseman/swift,xwu/swift,modocache/swift,airspeedswift/swift,calebd/swift,natecook1000/swift,frootloops/swift,lorentey/swift,zisko/swift,uasys/swift,practicalswift/swift,jmgc/swift,rudkx/swift,atrick/swift,hughbe/swift,sschiau/swift,tjw/swift,shajrawi/swift,stephentyrone/swift,gregomni/swift,tardieu/swift,tjw/swift,airspeedswift/swift,xwu/swift,jmgc/swift,IngmarStein/swift,ben-ng/swift,jckarter/swift,xedin/swift,bitjammer/swift,hughbe/swift,glessard/swift,codestergit/swift,austinzheng/swift,nathawes/swift,manavgabhawala/swift,stephentyrone/swift,calebd/swift,jckarter/swift,jmgc/swift,arvedviehweger/swift,swiftix/swift,deyton/swift,milseman/swift,hooman/swift,allevato/swift,harlanhaskins/swift,gmilos/swift,tjw/swift,danielmartin/swift,gribozavr/swift,natecook1000/swift,natecook1000/swift,aschwaighofer/swift,JGiola/swift,IngmarStein/swift,jckarter/swift,gmilos/swift,atrick/swift,shahmishal/swift,arvedviehweger/swift,harlanhaskins/swift,devincoughlin/swift,uasys/swift,swiftix/swift,modocache/swift,practicalswift/swift,gribozavr/swift,parkera/swift,kstaring/swift,CodaFi/swift,OscarSwanros/swift,bitjammer/swift,jopamer/swift,Jnosh/swift,karwa/swift,swiftix/swift,bitjammer/swift,nathawes/swift,jckarter/swift,frootloops/swift,manavgabhawala/swift,hughbe/swift,sschiau/swift,amraboelela/swift,ahoppen/swift,ahoppen/swift,tkremenek/swift,apple/swift,stephentyrone/swift,arvedviehweger/swift,atrick/swift,modocache/swift,OscarSwanros/swift,nathawes/swift,JGiola/swift,nathawes/swift,OscarSwanros/swift,return/swift,parkera/swift,lorentey/swift,hooman/swift,apple/swift,kstaring/swift,jopamer/swift,deyton/swift,tardieu/swift,lorentey/swift,shajrawi/swift,brentdax/swift,gregomni/swift,alblue/swift,alblue/swift,tinysun212/swift-windows,gottesmm/swift,harlanhaskins/swift,aschwaighofer/swift,OscarSwanros/swift,tardieu/swift,zisko/swift,JGiola/swift,jtbandes/swift,huonw/swift,jckarter/swift,hughbe/swift,devincoughlin/swift,JGiola/swift,arvedviehweger/swift,ben-ng/swift,tinysun212/swift-windows,nathawes/swift,djwbrown/swift,aschwaighofer/swift,therealbnut/swift,djwbrown/swift,parkera/swift,manavgabhawala/swift,xedin/swift,gmilos/swift,austinzheng/swift,glessard/swift,glessard/swift,shajrawi/swift,gribozavr/swift,return/swift,JGiola/swift,harlanhaskins/swift,zisko/swift,xwu/swift,shajrawi/swift,devincoughlin/swift,stephentyrone/swift,felix91gr/swift,parkera/swift,therealbnut/swift,karwa/swift,natecook1000/swift,xedin/swift,manavgabhawala/swift,jckarter/swift,roambotics/swift,xedin/swift,IngmarStein/swift,jopamer/swift,devincoughlin/swift,tkremenek/swift,sschiau/swift,kperryua/swift,rudkx/swift,airspeedswift/swift,modocache/swift,codestergit/swift,lorentey/swift,OscarSwanros/swift,JaSpa/swift,airspeedswift/swift,parkera/swift,djwbrown/swift,gmilos/swift,practicalswift/swift,milseman/swift,brentdax/swift,kperryua/swift,roambotics/swift,milseman/swift,gregomni/swift,ben-ng/swift,manavgabhawala/swift,jopamer/swift,xwu/swift,therealbnut/swift,djwbrown/swift,shajrawi/swift,modocache/swift,uasys/swift,tinysun212/swift-windows,calebd/swift,ahoppen/swift,OscarSwanros/swift,felix91gr/swift,IngmarStein/swift,danielmartin/swift,shahmishal/swift,atrick/swift,hooman/swift,JaSpa/swift,lorentey/swift,sschiau/swift,devincoughlin/swift,CodaFi/swift,hughbe/swift,benlangmuir/swift,jckarter/swift,therealbnut/swift,lorentey/swift,return/swift,benlangmuir/swift,danielmartin/swift,kstaring/swift,hughbe/swift,allevato/swift,tkremenek/swift,felix91gr/swift,shahmishal/swift,ben-ng/swift,kperryua/swift,xwu/swift,atrick/swift,natecook1000/swift,djwbrown/swift,JaSpa/swift,zisko/swift,calebd/swift,shahmishal/swift,arvedviehweger/swift,deyton/swift,parkera/swift,hooman/swift,CodaFi/swift,manavgabhawala/swift,gmilos/swift,huonw/swift,gregomni/swift,danielmartin/swift,jtbandes/swift,JaSpa/swift,zisko/swift,benlangmuir/swift,tjw/swift,jtbandes/swift