Update analysis.py

EyaDammak · web-flow · commit cc2fdbe2f1f6 · 2024-02-09T15:45:14.000-08:00
diff --git a/Examples/Tests/point_of_contact_EB/analysis.py b/Examples/Tests/point_of_contact_EB/analysis.py
@@ -1,10 +1,3 @@
-<<<<<<< HEAD
-import math
-
-import numpy as np
-
-=======
->>>>>>> ef1e962595decf0b2be4c24004b44886094e2cc5
 import matplotlib.pyplot as plt
 import numpy as np
 from openpmd_viewer import OpenPMDTimeSeries
