Remove rebase comment

xCDAT · Nov 21, 2024 · 9331a02 · 9331a02
1 parent 82cbfe2
commit 9331a02
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/xcdat/spatial.py b/xcdat/spatial.py
@@ -1,8 +1,5 @@
 """Module containing geospatial averaging functions."""
-<<<<<<< HEAD
 
-=======
->>>>>>> 34b570d6 (Updates from code review)
 from __future__ import annotations
 
 from functools import reduce