:twisted_arrows_rightwards: merge conflicts

cemac · Apr 9, 2019 · ef42116 · ef42116
2 parents 16a8474 + d2c81d6
commit ef42116
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 249 deletions.
diff --git a/Python/__pycache__/maptoolkit.cpython-37.pyc b/Python/__pycache__/maptoolkit.cpython-37.pyc
diff --git a/Python/analysis_tools/pmap.py b/Python/analysis_tools/pmap.py
diff --git a/Python/analysis_tools/pmap_plot.py b/Python/analysis_tools/pmap_plot.py
diff --git a/Python/genmaps.py → Python/comming_soon/genmaps.py b/Python/genmaps.py → Python/comming_soon/genmaps.py
diff --git a/Python/maptoolkit.py → Python/comming_soon/maptoolkit.py b/Python/maptoolkit.py → Python/comming_soon/maptoolkit.py
diff --git a/Python/maptoolkit.pyc b/Python/maptoolkit.pyc
diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@ Non anaconda installations require a separate build of ecCodes python API:
 Anaconda python, unix systems (recommended)
 
 ```
-git clone
+git clone https://github.com/cemac/UNRESPForecastingSystem.git
 cd UNRESPForecastingSystem
 conda env create -f environment.yml
 ```

diff --git a/tools/README.md b/tools/README.md
diff --git a/tools/michael_archive.sh b/tools/michael_archive.sh