remove chevrons from merge

firedrakeproject · Oct 24, 2023 · 51f4f91 · 51f4f91
1 parent 4794858
commit 51f4f91
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/gusto/timeloop.py b/gusto/timeloop.py
@@ -750,10 +750,6 @@ def setup_fields(self):
     def run(self, t, tmax, pick_up=False):
         """
         Runs the model for the specified time, from t to tmax
-<<<<<<< HEAD
-
-=======
->>>>>>> origin/main
         Args:
             t (float): the start time of the run
             tmax (float): the end time of the run