From d1c4f1a9a2ebb0728902117af63cd4eb631b9645 Mon Sep 17 00:00:00 2001 From: kevinjom Date: Wed, 10 Apr 2019 18:16:50 +0800 Subject: [PATCH] Fix minor mistake made from last merge for `README.md` See commit <6069d2864f881a5a03d18ef2637156bdc2c4c92c> --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 2a3828979..8ed4f451b 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,6 @@ There are several that you can contribute to Spring REST Docs: | Name | Description | | ---- | ----------- | -<<<<<<< HEAD | [restdocs-wiremock][17] | Auto-generate WireMock stubs as part of documenting your RESTful API | | [restdocsext-jersey][18] | Enables Spring REST Docs to be used with [Jersey's test framework][19] | | [spring-auto-restdocs][20] | Uses introspection and Javadoc to automatically document request and response parameters |