Remove merge conflict markers that I accidentally committed.
Remove merge conflict markers that I accidentally committed.

Swift SVN r28310

gmilos/swift,adrfer/swift,hughbe/swift,nathawes/swift,tjw/swift,devincoughlin/swift,JGiola/swift,adrfer/swift,Jnosh/swift,roambotics/swift,johnno1962d/swift,brentdax/swift,glessard/swift,gribozavr/swift,lorentey/swift,emilstahl/swift,therealbnut/swift,johnno1962d/swift,MukeshKumarS/Swift,aschwaighofer/swift,apple/swift,brentdax/swift,adrfer/swift,johnno1962d/swift,khizkhiz/swift,khizkhiz/swift,airspeedswift/swift,djwbrown/swift,codestergit/swift,swiftix/swift.old,natecook1000/swift,frootloops/swift,shahmishal/swift,bitjammer/swift,mightydeveloper/swift,gottesmm/swift,tkremenek/swift,jckarter/swift,calebd/swift,kstaring/swift,dduan/swift,cbrentharris/swift,parkera/swift,codestergit/swift,practicalswift/swift,SwiftAndroid/swift,natecook1000/swift,alblue/swift,shajrawi/swift,kstaring/swift,return/swift,shahmishal/swift,gmilos/swift,jopamer/swift,zisko/swift,OscarSwanros/swift,kstaring/swift,calebd/swift,benlangmuir/swift,calebd/swift,JGiola/swift,gmilos/swift,slavapestov/swift,LeoShimonaka/swift,Ivacker/swift,tinysun212/swift-windows,ben-ng/swift,felix91gr/swift,nathawes/swift,ben-ng/swift,swiftix/swift.old,JaSpa/swift,tinysun212/swift-windows,zisko/swift,lorentey/swift,huonw/swift,amraboelela/swift,LeoShimonaka/swift,devincoughlin/swift,milseman/swift,manavgabhawala/swift,amraboelela/swift,austinzheng/swift,practicalswift/swift,gribozavr/swift,KrishMunot/swift,adrfer/swift,gottesmm/swift,danielmartin/swift,therealbnut/swift,return/swift,practicalswift/swift,modocache/swift,Ivacker/swift,parkera/swift,arvedviehweger/swift,uasys/swift,Ivacker/swift,kentya6/swift,CodaFi/swift,jtbandes/swift,allevato/swift,MukeshKumarS/Swift,sschiau/swift,CodaFi/swift,arvedviehweger/swift,sdulal/swift,cbrentharris/swift,slavapestov/swift,glessard/swift,huonw/swift,Jnosh/swift,kusl/swift,deyton/swift,gribozavr/swift,russbishop/swift,amraboelela/swift,djwbrown/swift,JaSpa/swift,Jnosh/swift,aschwaighofer/swift,rudkx/swift,emilstahl/swift,MukeshKumarS/Swift,MukeshKumarS/Swift,therealbnut/swift,atrick/swift,allevato/swift,CodaFi/swift,Jnosh/swift,jckarter/swift,harlanhaskins/swift,gregomni/swift,shajrawi/swift,Ivacker/swift,kstaring/swift,codestergit/swift,hughbe/swift,MukeshKumarS/Swift,jmgc/swift,IngmarStein/swift,cbrentharris/swift,roambotics/swift,OscarSwanros/swift,zisko/swift,cbrentharris/swift,therealbnut/swift,natecook1000/swift,allevato/swift,lorentey/swift,felix91gr/swift,lorentey/swift,benlangmuir/swift,ken0nek/swift,gregomni/swift,therealbnut/swift,felix91gr/swift,natecook1000/swift,sschiau/swift,russbishop/swift,JGiola/swift,atrick/swift,swiftix/swift.old,gribozavr/swift,sdulal/swift,dduan/swift,karwa/swift,alblue/swift,shahmishal/swift,kentya6/swift,jopamer/swift,cbrentharris/swift,austinzheng/swift,sdulal/swift,airspeedswift/swift,xwu/swift,IngmarStein/swift,shahmishal/swift,mightydeveloper/swift,KrishMunot/swift,djwbrown/swift,tkremenek/swift,milseman/swift,rudkx/swift,nathawes/swift,LeoShimonaka/swift,harlanhaskins/swift,arvedviehweger/swift,rudkx/swift,OscarSwanros/swift,return/swift,ben-ng/swift,tkremenek/swift,gottesmm/swift,lorentey/swift,stephentyrone/swift,uasys/swift,mightydeveloper/swift,devincoughlin/swift,kusl/swift,kentya6/swift,tardieu/swift,kperryua/swift,Ivacker/swift,tjw/swift,cbrentharris/swift,khizkhiz/swift,arvedviehweger/swift,emilstahl/swift,slavapestov/swift,OscarSwanros/swift,zisko/swift,kstaring/swift,apple/swift,deyton/swift,karwa/swift,gribozavr/swift,SwiftAndroid/swift,sschiau/swift,uasys/swift,djwbrown/swift,austinzheng/swift,modocache/swift,ben-ng/swift,shajrawi/swift,frootloops/swift,jopamer/swift,arvedviehweger/swift,aschwaighofer/swift,tjw/swift,gottesmm/swift,hooman/swift,CodaFi/swift,KrishMunot/swift,roambotics/swift,sschiau/swift,swiftix/swift.old,codestergit/swift,ahoppen/swift,KrishMunot/swift,modocache/swift,OscarSwanros/swift,gregomni/swift,xwu/swift,kperryua/swift,ken0nek/swift,dreamsxin/swift,danielmartin/swift,huonw/swift,airspeedswift/swift,atrick/swift,amraboelela/swift,roambotics/swift,ahoppen/swift,kusl/swift,jtbandes/swift,shajrawi/swift,swiftix/swift,parkera/swift,felix91gr/swift,harlanhaskins/swift,jmgc/swift,apple/swift,calebd/swift,uasys/swift,frootloops/swift,kperryua/swift,xwu/swift,harlanhaskins/swift,LeoShimonaka/swift,devincoughlin/swift,adrfer/swift,JGiola/swift,jmgc/swift,rudkx/swift,jmgc/swift,gregomni/swift,brentdax/swift,manavgabhawala/swift,emilstahl/swift,calebd/swift,practicalswift/swift,huonw/swift,KrishMunot/swift,djwbrown/swift,codestergit/swift,danielmartin/swift,arvedviehweger/swift,amraboelela/swift,practicalswift/swift,gmilos/swift,zisko/swift,milseman/swift,codestergit/swift,austinzheng/swift,ken0nek/swift,slavapestov/swift,ken0nek/swift,ben-ng/swift,uasys/swift,russbishop/swift,xedin/swift,stephentyrone/swift,tardieu/swift,tardieu/swift,xwu/swift,zisko/swift,emilstahl/swift,apple/swift,atrick/swift,karwa/swift,xedin/swift,tjw/swift,swiftix/swift,tkremenek/swift,khizkhiz/swift,gribozavr/swift,amraboelela/swift,khizkhiz/swift,glessard/swift,gregomni/swift,jopamer/swift,johnno1962d/swift,nathawes/swift,gmilos/swift,hooman/swift,kperryua/swift,CodaFi/swift,djwbrown/swift,frootloops/swift,nathawes/swift,OscarSwanros/swift,practicalswift/swift,bitjammer/swift,benlangmuir/swift,sdulal/swift,ken0nek/swift,ahoppen/swift,xedin/swift,brentdax/swift,stephentyrone/swift,roambotics/swift,tkremenek/swift,lorentey/swift,gmilos/swift,practicalswift/swift,emilstahl/swift,allevato/swift,harlanhaskins/swift,JaSpa/swift,MukeshKumarS/Swift,khizkhiz/swift,dduan/swift,karwa/swift,manavgabhawala/swift,kperryua/swift,manavgabhawala/swift,milseman/swift,adrfer/swift,jopamer/swift,austinzheng/swift,sdulal/swift,brentdax/swift,gmilos/swift,tardieu/swift,atrick/swift,mightydeveloper/swift,danielmartin/swift,CodaFi/swift,LeoShimonaka/swift,calebd/swift,JGiola/swift,sschiau/swift,kentya6/swift,jckarter/swift,calebd/swift,aschwaighofer/swift,swiftix/swift,huonw/swift,glessard/swift,LeoShimonaka/swift,mightydeveloper/swift,return/swift,modocache/swift,Ivacker/swift,JaSpa/swift,austinzheng/swift,kperryua/swift,jopamer/swift,deyton/swift,therealbnut/swift,shahmishal/swift,IngmarStein/swift,shahmishal/swift,jckarter/swift,stephentyrone/swift,shajrawi/swift,dduan/swift,kperryua/swift,jmgc/swift,cbrentharris/swift,LeoShimonaka/swift,tardieu/swift,return/swift,bitjammer/swift,SwiftAndroid/swift,airspeedswift/swift,kusl/swift,tardieu/swift,tinysun212/swift-windows,uasys/swift,uasys/swift,glessard/swift,tinysun212/swift-windows,SwiftAndroid/swift,hooman/swift,gottesmm/swift,milseman/swift,emilstahl/swift,sdulal/swift,manavgabhawala/swift,lorentey/swift,deyton/swift,allevato/swift,JaSpa/swift,cbrentharris/swift,apple/swift,tjw/swift,swiftix/swift.old,ahoppen/swift,tinysun212/swift-windows,harlanhaskins/swift,alblue/swift,therealbnut/swift,johnno1962d/swift,danielmartin/swift,parkera/swift,modocache/swift,deyton/swift,SwiftAndroid/swift,tkremenek/swift,jmgc/swift,russbishop/swift,modocache/swift,kentya6/swift,johnno1962d/swift,devincoughlin/swift,IngmarStein/swift,russbishop/swift,parkera/swift,MukeshKumarS/Swift,russbishop/swift,natecook1000/swift,ahoppen/swift,return/swift,modocache/swift,hooman/swift,xwu/swift,jtbandes/swift,gottesmm/swift,alblue/swift,karwa/swift,adrfer/swift,gribozavr/swift,Jnosh/swift,tinysun212/swift-windows,huonw/swift,KrishMunot/swift,slavapestov/swift,IngmarStein/swift,jckarter/swift,danielmartin/swift,frootloops/swift,allevato/swift,jtbandes/swift,ben-ng/swift,karwa/swift,bitjammer/swift,aschwaighofer/swift,tkremenek/swift,hooman/swift,Jnosh/swift,dduan/swift,arvedviehweger/swift,lorentey/swift,mightydeveloper/swift,swiftix/swift.old,benlangmuir/swift,jckarter/swift,xedin/swift,IngmarStein/swift,shajrawi/swift,milseman/swift,practicalswift/swift,shahmishal/swift,ben-ng/swift,bitjammer/swift,slavapestov/swift,xedin/swift,shajrawi/swift,kusl/swift,felix91gr/swift,sschiau/swift,austinzheng/swift,aschwaighofer/swift,shahmishal/swift,airspeedswift/swift,zisko/swift,jmgc/swift,stephentyrone/swift,swiftix/swift.old,jtbandes/swift,bitjammer/swift,parkera/swift,tardieu/swift,swiftix/swift,IngmarStein/swift,deyton/swift,Jnosh/swift,djwbrown/swift,parkera/swift,benlangmuir/swift,johnno1962d/swift,xedin/swift,brentdax/swift,kstaring/swift,kusl/swift,airspeedswift/swift,brentdax/swift,tjw/swift,SwiftAndroid/swift,nathawes/swift,dduan/swift,manavgabhawala/swift,danielmartin/swift,hughbe/swift,natecook1000/swift,benlangmuir/swift,natecook1000/swift,roambotics/swift,KrishMunot/swift,tinysun212/swift-windows,return/swift,LeoShimonaka/swift,xwu/swift,huonw/swift,devincoughlin/swift,kentya6/swift,hooman/swift,OscarSwanros/swift,felix91gr/swift,ken0nek/swift,russbishop/swift,sschiau/swift,parkera/swift,swiftix/swift,hughbe/swift,rudkx/swift,JaSpa/swift,aschwaighofer/swift,ken0nek/swift,hughbe/swift,CodaFi/swift,sdulal/swift,jckarter/swift,SwiftAndroid/swift,glessard/swift,khizkhiz/swift,manavgabhawala/swift,kstaring/swift,jtbandes/swift,airspeedswift/swift,gribozavr/swift,gottesmm/swift,harlanhaskins/swift,alblue/swift,allevato/swift,felix91gr/swift,xedin/swift,swiftix/swift,kentya6/swift,stephentyrone/swift,shajrawi/swift,rudkx/swift,xedin/swift,nathawes/swift,slavapestov/swift,atrick/swift,tjw/swift,devincoughlin/swift,mightydeveloper/swift,hughbe/swift,amraboelela/swift,kentya6/swift,jopamer/swift,sdulal/swift,emilstahl/swift,JGiola/swift,jtbandes/swift,bitjammer/swift,deyton/swift,alblue/swift,milseman/swift,mightydeveloper/swift,alblue/swift,Ivacker/swift,kusl/swift,swiftix/swift,gregomni/swift,JaSpa/swift,Ivacker/swift,dreamsxin/swift,ahoppen/swift,karwa/swift,hughbe/swift,hooman/swift,swiftix/swift.old,sschiau/swift,frootloops/swift,stephentyrone/swift,karwa/swift,codestergit/swift,apple/swift,devincoughlin/swift,xwu/swift,kusl/swift,dduan/swift,frootloops/swift