Fix conflict

GlacioHack · Sep 18, 2022 · 687c89a · 687c89a
1 parent dbf3dad
commit 687c89a
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/dev-environment.yml b/dev-environment.yml
@@ -30,11 +30,8 @@ dependencies:
   - flake8
   - sphinx-autodoc-typehints
   - sphinx-gallery
-<<<<<<< Updated upstream
   - pyyaml
-=======
   - richdem
->>>>>>> Stashed changes
 
   - pip:
     - git+https://github.com/GlacioHack/geoutils.git