update readme

diff --git a/README.md b/README.md
index 34cb390e589fcf59fa22604005573d2003e388d9..a9ec9502173c9105ac93b00888be0bc0c6fc484b 100644 (file)
--- a/README.md
+++ b/README.md
@@ -40,7 +40,6 @@ Check the [Tutorials](https://github.com/jpbruyere/Crow/wiki/Tutorials) for a qu
 The `ShowCase`sample will allow you to quickly test IML with live result.
 
 <p align="center">
-<<<<<<< Updated upstream
   <a href="https://github.com/jpbruyere/Crow/blob/master/Images/showCase.png">
        <kbd><img src="https://github.com/jpbruyere/Crow/blob/master/Images/showCase.png" height="200"></kbd>
   </a>