From 51f4f9142ea72a790b497652a732e130ef2f7d16 Mon Sep 17 00:00:00 2001
From: Tom Bendall <thomas.bendall@metoffice.gov.uk>
Date: Tue, 24 Oct 2023 14:08:06 +0100
Subject: [PATCH] remove chevrons from merge

---
 gusto/timeloop.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/gusto/timeloop.py b/gusto/timeloop.py
index c020c8bb8..a7fc661b3 100644
--- 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