reverting setup.cfg

spacetelescope · Apr 29, 2022 · 8e402b2 · 8e402b2
1 parent 833537b
commit 8e402b2
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/setup.cfg b/setup.cfg
@@ -30,12 +30,7 @@ install_requires =
     pyparsing>=2.2
     requests>=2.22
     roman_datamodels>=0.11.0
-<<<<<<< HEAD
     stcal>=0.2.5
-=======
-    romanad==0.10.0
-    stcal @  git+https://github.com/cshanahan1/stcal.git@charge_spill_sat_fix
->>>>>>> 8d0c71f... new param for saturation, continute to not flag adjacent pixels for now
     stpipe>=0.3.1
 
 [options.extras_require]