From: Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
Date: Sat, 30 Oct 2021 20:59:06 +0000 (+0200)
Subject: update readme
X-Git-Tag: v0.9.8-beta~6
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=2dc30c4d59e51101a692b9533fef7aa7ccc13afd;p=jp%2Fcrow.git

update readme
---

diff --git a/README.md b/README.md
index 34cb390e..a9ec9502 100644
--- 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>