Add images to the webapp pages.

36ab9fa3 · ncastejon · FORESTIER Fabien · 74eaf664 · 74eaf664 · 74eaf664
Commit 36ab9fa3 authored 5 years ago by ncastejon Committed by FORESTIER Fabien 5 years ago
--- a/docs/assets/changelog.png
+++ b/docs/assets/changelog.png
--- a/docs/assets/credits.png
+++ b/docs/assets/credits.png
--- a/docs/assets/data.png
+++ b/docs/assets/data.png
--- a/docs/assets/download-resources.png
+++ b/docs/assets/download-resources.png
--- a/docs/assets/filters.png
+++ b/docs/assets/filters.png
--- a/docs/assets/geo-services.png
+++ b/docs/assets/geo-services.png
--- a/docs/assets/homepage.png
+++ b/docs/assets/homepage.png
--- a/docs/assets/search.png
+++ b/docs/assets/search.png
--- a/docs/assets/suggestion.png
+++ b/docs/assets/suggestion.png
--- a/docs/components/custom-apps/web-app/search.md
+++ b/docs/components/custom-apps/web-app/search.md
@@ -9,11 +9,7 @@ Here are the features existing on the portal:
 Of course there is a plenty of room for improvements for these features (and for new ones). ES is very powerful but also very complex to master. It's in a constant improvement.
-<<<<<<< HEAD
 ![Search page](../../../assets/webapp/search.png)
-=======
-![Search page](../../../assets/search.png)
->>>>>>> ab4dc67... Start doc for Resources. Add some images to improve different pages.
 ## Datasets results