Merged unrelated histories, resolving conflicts

README.md

@@ -1,28 +1,3 @@
-<<<<<<< HEAD
-# streamlit-geospatial
-
-A streamlit multipage app for geospatial applications. It can be deployed to [Streamlit Cloud](https://streamlit.io/cloud), [Heroku](https://heroku.com/), or [MyBinder](https://mybinder.org/).
-
-[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/giswqs/streamlit-geospatial/master?urlpath=proxy/8501/)
-
-- Web app: <https://streamlit.gishub.org>
-- Source code: <https://github.com/giswqs/streamlit-geospatial>
-
-## Instructions
-
-1. For the GitHub repository to your GitHub account.
-2. Customize the sidebar by changing the sidebar text and logo in each Python file.
-3. Find your favorite emoji from https://emojipedia.org.
-4. Add a new app to the `pages/` directory with an emoji in the file name, e.g., 1_🚀_Chart.py.
-
-## Demo
-
-![](https://i.imgur.com/6lj0oAO.png)
-
-## Real Estate Data and Market Trends
-
-![](https://i.imgur.com/Z3dk6Tr.gif)
-=======
 ---
 title: Streamlit Geospatial
 emoji: 🌍
@@ -36,4 +11,3 @@ license: apache-2.0
 ---
 
 Check out the configuration reference at https://huggingface.co/docs/hub/spaces-config-reference
->>>>>>> eec4c2aa45e6e78998e62988cf6f833d1966c044