From 741867b5f3ba09005d53725e0f5b1030d3d76548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Hurtado?= Date: Fri, 30 Aug 2019 13:18:00 +0200 Subject: [PATCH] Fix data/handler/success feature file --- spec/test/features/data/handler/success.feature | 1 - 1 file changed, 1 deletion(-) diff --git a/spec/test/features/data/handler/success.feature b/spec/test/features/data/handler/success.feature index 1101048..aa12587 100644 --- a/spec/test/features/data/handler/success.feature +++ b/spec/test/features/data/handler/success.feature @@ -7,7 +7,6 @@ Feature: Retrieve a resource from a handler in Kapow! server. Get the "request/path" resource for the current request through the handler id. -<<<<<<< HEAD Given I have a Kapow! server with the following testing routes: | method | url_pattern | | GET | /listRootDir |