Merge pull request #609 from mfixstsci/fix-merge-conflicts

Resolve merge conflicts
ExoCTK · Aug 1, 2024 · 445935e · 445935e
2 parents f4b3d58 + 8878539
commit 445935e
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 31 deletions.
diff --git a/env/environment-3.10.yml b/env/environment-3.10.yml
@@ -35,10 +35,6 @@ dependencies:
     - docutils>=0.16
     - flask_wtf>=1.1.1
     - h5py>=3.9.0
-<<<<<<< HEAD
-=======
-    - hotsoss>=0.1.9
->>>>>>> c5ab1de0367f728b47615a8b555655631b23b1ca
     - gunicorn>=21.1.0
     - numpy>=1.25.1
     - platon>=5.4
@@ -50,10 +46,6 @@ dependencies:
     - scipy>=1.11.1
     - sphinx_astropy>=1.9.1
     - svo-filters>=0.4.4
-<<<<<<< HEAD
     - werkzeug>=3.0.1
-=======
-    - werkzeug==2.0.3
->>>>>>> c5ab1de0367f728b47615a8b555655631b23b1ca
     - jwst_gtvt>=1.0.0
     - astroquery>=0.4.6
diff --git a/env/environment-3.11.yml b/env/environment-3.11.yml
@@ -32,16 +32,9 @@ dependencies:
     - bibtexparser>=1.4.0
     - boto3>=1.28.5
     - corner>=2.2.2
-<<<<<<< HEAD
-    - docutils>=0.16ssss
-    - flask_wtf>=1.1.1
-    - h5py>=3.9.0
-=======
     - docutils>=0.16
     - flask_wtf>=1.1.1
     - h5py>=3.9.0
-    - hotsoss>=0.1.9
->>>>>>> c5ab1de0367f728b47615a8b555655631b23b1ca
     - gunicorn>=21.1.0
     - numpy>=1.25.1
     - platon>=5.4
@@ -53,10 +46,6 @@ dependencies:
     - scipy>=1.11.1
     - sphinx_astropy>=1.9.1
     - svo-filters>=0.4.4
-<<<<<<< HEAD
     - werkzeug>=3.0.1
-=======
-    - werkzeug==2.0.3
->>>>>>> c5ab1de0367f728b47615a8b555655631b23b1ca
     - jwst_gtvt>=1.0.0
     - astroquery>=0.4.6
diff --git a/env/environment-3.9.yml b/env/environment-3.9.yml
@@ -35,10 +35,6 @@ dependencies:
     - docutils>=0.16
     - flask_wtf>=1.1.1
     - h5py>=3.9.0
-<<<<<<< HEAD
-=======
-    - hotsoss>=0.1.9
->>>>>>> c5ab1de0367f728b47615a8b555655631b23b1ca
     - gunicorn>=21.1.0
     - markupsafe==2.0.1
     - numpy>=1.25.1
@@ -51,10 +47,6 @@ dependencies:
     - scipy>=1.11.1
     - sphinx_astropy>=1.9.1
     - svo-filters>=0.4.4
-<<<<<<< HEAD
     - werkzeug>=3.0.1
-=======
-    - werkzeug==2.0.3
->>>>>>> c5ab1de0367f728b47615a8b555655631b23b1ca
     - jwst_gtvt>=1.0.0
     - astroquery>=0.4.6
diff --git a/requirements.txt b/requirements.txt
@@ -14,10 +14,6 @@ flask>=1.1.2
 flask_wtf>=0.14.3
 gunicorn>=20.1.0
 h5py>=3.2.1
-<<<<<<< HEAD
-=======
-hotsoss>=0.1.9
->>>>>>> c5ab1de0367f728b47615a8b555655631b23b1ca
 ipython>=7.22.0
 jwst-gtvt>=1.0.0
 matplotlib>=3.4.1