aboutsummaryrefslogtreecommitdiffstatsci
diff options
context:
space:
mode:
-rw-r--r--README.md1
1 files changed, 0 insertions, 1 deletions
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>