Merge branch 'master' of https://github.com/sunt05/UMEP-Docs

UMEP-dev · May 16, 2018 · 7644a27 · 7644a27
2 parents b7c7e64 + 4317291
commit 7644a27
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/docs/source/Contributing_with_python_code_to_the_UMEP_plugin_in_QGIS.rst b/docs/source/Contributing_with_python_code_to_the_UMEP_plugin_in_QGIS.rst
@@ -583,7 +583,11 @@ or adding new variables.
 * SUEWS\_SiteLibrary.xls
     - This file contains all the different information connected to different site. Each excel sheet is connected to a different kind of information like vegetation and water data and each line in a sheet represents a different area or site. This information is used to determine what kind of information and variable will be present in a widget of a site library tab.
 
+<<<<<<< HEAD
       .. figure:: /images/Figure14.png
+=======
+      .. figure:: images/Figure14.png
+>>>>>>> 43172911852e1588945005ae55846da7a874b6cf
 
           Empty widget not connected to any sheet from the SUEWS_SiteLibrary document.