Resolve merge conflict by incorporating both suggestions

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(