fix failed merge

keflavich · adrn · commit 90853bad8125 · 2022-03-31T11:26:15.000-04:00
diff --git a/requirements.txt b/requirements.txt
@@ -12,8 +12,5 @@ reproject
 dust_extinction
 gala
 synphot
-<<<<<<< HEAD
 pyvo==1.2.0
-=======
 pvextractor
->>>>>>> a911f0e... add pvextractor to reqs
