missed a conflict. fixed now. sorry.

GeminiDRSoftware · Mar 17, 2021 · 3298a2f · 3298a2f
1 parent 0fec24a
commit 3298a2f
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/geminidr/core/primitives_preprocess.py b/geminidr/core/primitives_preprocess.py
@@ -422,15 +422,10 @@ def darkCorrect(self, adinputs=None, suffix=None, dark=None, do_cal=None):
                 continue
 
             if dark is None:
-<<<<<<< HEAD
                 if 'sq' not in self.mode and do_cal != 'force':
                     log.warning("No changes will be made to {}, since no "
                                 "dark was specified".format(ad.filename))
                     continue
-=======
-                if 'sq' in self.mode:
-                    raise OSError(f"No processed dark listed for {ad.filename}")
->>>>>>> 1c92a441ff5ea3b34e9ac7bc47fff896dc3a4db2
                 else:
                     log.warning(f"{ad.filename}: no dark was specified. "
                                 "Continuing.")