From 2dc30c4d59e51101a692b9533fef7aa7ccc13afd Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jean-Philippe=20Bruy=C3=A8re?= <jp_bruyere@hotmail.com>
Date: Sat, 30 Oct 2021 22:59:06 +0200
Subject: [PATCH] update readme

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

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>
-- 
2.47.3