aboutsummaryrefslogtreecommitdiffstatsci
diff options
context:
space:
mode:
authorJean-Philippe Bruyère <jp_bruyere@hotmail.com>2021-10-30 22:57:57 +0200
committerJean-Philippe Bruyère <jp_bruyere@hotmail.com>2021-10-30 22:57:57 +0200
commit4696a4a749559f036f912990eaa8271c6b7f170a (patch)
tree99f5bdbd47aaaf4a68c7fbba91a40da154a982eb
parent602d5d4686cfd5c50d65fd18105cb6096d51c0bd (diff)
parentfc2bf46e49e17bd49232a0290543cb48b856ca5c (diff)
wxMerge branch 'master' of github.com:jpbruyere/Crow
-rw-r--r--README.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/README.md b/README.md
index a9ec9502..34cb390e 100644
--- a/README.md
+++ b/README.md
@@ -40,6 +40,7 @@ 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>