Missed a merge tag

casangi · Oct 4, 2023 · 1561e1f · 1561e1f
1 parent 111d501
commit 1561e1f
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/src/astrohack/_utils/_extract_locit.py b/src/astrohack/_utils/_extract_locit.py
@@ -336,10 +336,6 @@ def _plot_source_table(filename, src_dict, label=True, precessed=False, obs_midp
     return
 
 
-<<<<<<< HEAD
-def _plot_antenna_table(ant_dict, telescope_name, param_dict):
-    """Plot antenna positions"""
-=======
 def _plot_array_configuration(ant_dict, telescope_name, parm_dict):
     """ backend for plotting array configuration
 
@@ -348,7 +344,6 @@ def _plot_array_configuration(ant_dict, telescope_name, parm_dict):
         telescope_name: Name of the telescope used in observations
         parm_dict: Parameter dictionary crafted by the calling function
     """
->>>>>>> main
 
     telescope = _open_telescope(telescope_name)
     stations = param_dict['stations']