From 2ce5b30448acacd21d4b46bc3757393946a4f69b Mon Sep 17 00:00:00 2001
From: Fayder Florez <fayder@monese.com>
Date: Mon, 6 Mar 2017 15:56:08 +0200
Subject: [PATCH] Minor correction

---
 src/main/webapp/index.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
index bd9cda9c..adbbdf1f 100644
--- a/src/main/webapp/index.html
+++ b/src/main/webapp/index.html
@@ -74,7 +74,6 @@ <h1>REST Countries</h1>
     </div>
     <div role='flatdoc-content' class='content'></div>
   </div>
->>>>>>> v2
 
   <script src="js/restc.min.js" type="text/javascript" charset="utf-8" async defer></script>
 </body>