Kraken: fix rebase
Kraken: fix rebase

VincentCATILLON/navitia,VincentCATILLON/navitia,prhod/navitia,TeXitoi/navitia,stifoon/navitia,CanalTP/navitia,kinnou02/navitia,pbougue/navitia,prhod/navitia,thiphariel/navitia,datanel/navitia,djludo/navitia,CanalTP/navitia,fueghan/navitia,lrocheWB/navitia,francois-vincent/navitia,CanalTP/navitia,kadhikari/navitia,kinnou02/navitia,djludo/navitia,lrocheWB/navitia,pbougue/navitia,patochectp/navitia,ballouche/navitia,CanalTP/navitia,fueghan/navitia,fueghan/navitia,Tisseo/navitia,lrocheWB/navitia,xlqian/navitia,patochectp/navitia,kadhikari/navitia,francois-vincent/navitia,TeXitoi/navitia,antoine-de/navitia,patochectp/navitia,francois-vincent/navitia,stifoon/navitia,frodrigo/navitia,pbougue/navitia,kadhikari/navitia,datanel/navitia,xlqian/navitia,VincentCATILLON/navitia,frodrigo/navitia,ballouche/navitia,xlqian/navitia,patochectp/navitia,lrocheWB/navitia,thiphariel/navitia,frodrigo/navitia,francois-vincent/navitia,is06/navitia,antoine-de/navitia,xlqian/navitia,djludo/navitia,VincentCATILLON/navitia,stifoon/navitia,Tisseo/navitia,TeXitoi/navitia,kadhikari/navitia,kinnou02/navitia,antoine-de/navitia,CanalTP/navitia,is06/navitia,is06/navitia,datanel/navitia,frodrigo/navitia,fueghan/navitia,ballouche/navitia,thiphariel/navitia,ballouche/navitia,Tisseo/navitia,xlqian/navitia,Tisseo/navitia,is06/navitia,pbougue/navitia,TeXitoi/navitia,kinnou02/navitia,thiphariel/navitia,Tisseo/navitia,prhod/navitia,datanel/navitia,prhod/navitia,antoine-de/navitia,stifoon/navitia,djludo/navitia