fix bad merge in tests
fix bad merge in tests

justinwoo/RxJS,figueredo/RxJS,martinsik/rxjs,adrianomelo/RxJS-1,Drooids/RxJS,luisgabriel/RxJS,Igorbek/rxjs5,luisgabriel/RxJS,jadbox/RxJS,saneyuki/RxJS,SangKa/RxJS-Docs-CN,SangKa/RxJS-Docs-CN,sitexa/RxJS,justinwoo/RxJS,justinwoo/RxJS,robwormald/RxJS,sitexa/RxJS,trxcllnt/RxJS,figueredo/RxJS,saneyuki/RxJS,adrianomelo/RxJSNext,benlesh/RxJS,adrianomelo/RxJSNext,jeremymwells/RxJS,RxJS-CN/RxJS-Docs-CN,mattpodwysocki/RxJS,Brocco/RxJS,kwonoj/RxJS,kwonoj/RxJS,QuinntyneBrown/RxJS,figueredo/RxJS,jayphelps/rxjs,gjungb/RxJS,Igorbek/rxjs5,martinsik/rxjs,pselle/RxJS,pselle/RxJS,Brocco/RxJS,sitexa/RxJS,elliotschi/rxjs,Amirus/RxJS-1,trxcllnt/RxJS,gjungb/RxJS,SangKa/RxJS-Docs-CN,smaye81/RxJS,ReactiveX/RxJS,staltz/RxJSNext,gluck/RxJS,elliotschi/rxjs,jeremymwells/RxJS,martinsik/rxjs,Igorbek/rxjs5,ReactiveX/RxJS,figueredo/RxJS,jaawerth/RxJS-1,QuinntyneBrown/RxJS,SekibOmazic/RxJS,jaawerth/RxJS-1,pselle/RxJS,trxcllnt/RxJS,ReactiveX/rxjs,ReactiveX/rxjs,IgorMinar/RxJS,robwormald/RxJS,benlesh/RxJS,IgorMinar/RxJS,smaye81/RxJS,jeremymwells/RxJS,gluck/RxJS,luisgabriel/RxJS,benlesh/RxJS,Drooids/RxJS,jayphelps/rxjs,RxJS-CN/RxJS-Docs-CN,mattpodwysocki/RxJS,mattpodwysocki/RxJS,mattpodwysocki/RxJS,smaye81/RxJS,jinroh/RxJS,benlesh/RxJS,gjungb/RxJS,adrianomelo/RxJSNext,jadbox/RxJS,staltz/RxJSNext,Amirus/RxJS-1,adrianomelo/RxJS-1,Drooids/RxJS,SangKa/RxJS-Docs-CN,luisgabriel/RxJS,jaawerth/RxJS-1,Amirus/RxJS-1,adrianomelo/RxJS-1,ReactiveX/rxjs,jinroh/RxJS,SekibOmazic/RxJS,RxJS-CN/RxJS-Docs-CN,trxcllnt/RxJS,staltz/RxJSNext,Igorbek/rxjs5,jadbox/RxJS,elliotschi/rxjs,jayphelps/rxjs,martinsik/rxjs,gluck/RxJS,ReactiveX/RxJS,jayphelps/rxjs,elliotschi/rxjs,jaawerth/RxJS-1,kwonoj/RxJS,gluck/RxJS,adrianomelo/RxJSNext,jayphelps/rxjs,justinwoo/RxJS,staltz/RxJSNext,ReactiveX/rxjs,jinroh/RxJS,Brocco/RxJS,adrianomelo/RxJS-1,jinroh/RxJS,robwormald/RxJS,RxJS-CN/RxJS-Docs-CN,sitexa/RxJS,QuinntyneBrown/RxJS,Brocco/RxJS,ReactiveX/RxJS,SekibOmazic/RxJS,kwonoj/RxJS,robwormald/RxJS,gjungb/RxJS,jadbox/RxJS