Resolve merge conflict by incorporating both suggestions

2025-03-13 12:05:27 +01:00 · 2025-03-13 12:05:27 +01:00 · 0df253d70f
parent 571ac20d37 2715d225af
commit 0df253d70f
1 changed files with 5 additions and 0 deletions
--- a/View/sediment_calibration_tab.py
+++ b/View/sediment_calibration_tab.py
@ -1795,6 +1795,11 @@ class SedimentCalibrationTab(QWidget):
            msgBox.setText("Update data before importing calibration")
            msgBox.setStandardButtons(QMessageBox.Ok)
            msgBox.exec()
+
+        elif stg.filename_calibration_file == "":
+
+            pass
+
        else:
            # --- Read calibration file ---
            data = pd.read_csv(