From 1e76db8c1d4b82a86f6ac1366a71e67544ed76ec Mon Sep 17 00:00:00 2001
From: Nuno Duarte <duarten@max-exfl001.desy.de>
Date: Wed, 28 Sep 2022 11:34:17 +0200
Subject: [PATCH] Solve merge conflicts
---
notebooks/ePix100/Characterize_Darks_ePix100_NBC.ipynb | 1 +
1 file changed, 1 insertion(+)
diff --git a/notebooks/ePix100/Characterize_Darks_ePix100_NBC.ipynb b/notebooks/ePix100/Characterize_Darks_ePix100_NBC.ipynb
index 40b1bf12a..5af065e74 100644
--- a/notebooks/ePix100/Characterize_Darks_ePix100_NBC.ipynb
+++ b/notebooks/ePix100/Characterize_Darks_ePix100_NBC.ipynb
@@ -86,6 +86,7 @@
"from XFELDetAna import xfelpyanatools as xana\n",
"from XFELDetAna import xfelpycaltools as xcal\n",
"from XFELDetAna.plotting.util import prettyPlotting\n",
+ "\n",
"from cal_tools.enums import BadPixels\n",
"from cal_tools.step_timing import StepTimer\n",
"from cal_tools.epix100 import epix100lib\n",
--
GitLab