From 85b8c203a414fa3650401cd5c6aa926dd1e275d9 Mon Sep 17 00:00:00 2001
From: Brian Michel <brian.michel@gmail.com>
Date: Mon, 22 May 2017 22:46:13 -0400
Subject: [PATCH] Removing half of conflict marker (#268)

Looks like there was just part of a conflict marker in the README file, so I figured I'd remove it.
---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 046e797..8e5a6bc 100644
--- a/README.md
+++ b/README.md
@@ -168,8 +168,6 @@ s.HandleFunc("/{key}/", ProductHandler)
 // "/products/{key}/details"
 s.HandleFunc("/{key}/details", ProductDetailsHandler)
 ```
-
-<<<<<<< f85983fbfd0e0146e24ba184acbdca25f0361e99
 ### Listing Routes
 
 Routes on a mux can be listed using the Router.Walk method—useful for generating documentation: