update environment

bird-house · Oct 3, 2020 · e16de04 · e16de04
1 parent 207682a
commit e16de04
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/environment.yml b/environment.yml
@@ -7,10 +7,7 @@ dependencies:
 - sphinx
 - nbsphinx
 - nb_conda_kernels
-<<<<<<< HEAD
-=======
 - pywps
-- jupyter-client 
->>>>>>> tutorials
+- jupyter-client
 - pip:
   - sphinxcontrib-bibtex