Merge branch 'develop' of https://git.geophysik.ruhr-uni-bochum.de/marcel/pylot into develop

pylot/core/io/getEventListFromXML.py

@@ -8,8 +8,16 @@
    Edited for use in PyLoT
    JG, igem, 01/2022
 """
+<<<<<<< HEAD
+
+import os
+import argparse
+import numpy as np
+import matplotlib.pyplot as plt
+=======
 import glob
 
+>>>>>>> 83ba63a3fdd8ad0a212333928cfcd6f45fcb5baa
 from obspy.core.event import read_events
 from pyproj import Proj