From 1e0ec0ab8f2513a66ae0702027fcd2af1f65e85c Mon Sep 17 00:00:00 2001 From: Moritz Kobitzsch Date: Mon, 7 Nov 2016 18:20:02 +0100 Subject: [PATCH] fix messed up cherry-pick --- features/guidance/roundabout.feature | 30 ---------------------------- 1 file changed, 30 deletions(-) diff --git a/features/guidance/roundabout.feature b/features/guidance/roundabout.feature index efd285fec..5638742bc 100644 --- a/features/guidance/roundabout.feature +++ b/features/guidance/roundabout.feature @@ -403,36 +403,6 @@ Feature: Basic Roundabout #| w,x | ll,egg,egg,tr,tr | depart,roundabout-exit-1,roundabout-exit-2,arrive | | w,x | ll,egg,egg,tr,tr | depart,turn right,continue left,turn slight left,arrive | -<<<<<<< HEAD -======= - Scenario: Use Lane in Roundabout - Given the node map - """ - . i . . . .. . - .' '. - a - b. f - g - . | - '. 1 / - '. / - j - - - c . . e - ' d ' - ' h - """ - - #using roundabout as name, we can ignore whether we see a roundabout or a rotary here. Cucumber output will be the same - And the ways - | nodes | junction | name | oneway | turn:lanes:forward | - | ba | | left-out | yes | | - | jc | | left-in | yes | | - | dh | | right-bot-out | yes | | - | fg | | right-top-out | yes | | - | bc | roundabout | roundabout | yes | left;through\|through | - | cdefib | roundabout | roundabout | yes | | - - When I route I should get - | waypoints | route | turns | - | 1,h | roundabout,right-bot-out,right-bot-out | depart,roundabout-exit-1,arrive | - @3254 Scenario: Driving up to and through a roundabout Given the node map