Remove HEAD text from README

sanelson2000 · Feb 14, 2014 · 9832854 · 9832854
1 parent 9f52de1
commit 9832854
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -183,7 +183,6 @@ class Swagger::Docs::Config
 end
 ```
 
-<<<<<<< HEAD
 #### Custom route discovery for supporting Rails Engines
 
 By default, swagger-docs finds controllers by traversing routes in `Rails.application`.