clean up

PCMDI · Feb 20, 2025 · c3e9aca · c3e9aca
1 parent da653f2
commit c3e9aca
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/doc/obs_info/catalogue/build_obs4MIPsClims-pcmdi.py b/doc/obs_info/catalogue/build_obs4MIPsClims-pcmdi.py
@@ -1,5 +1,10 @@
 #!/usr/bin/env python
 
+<<<<<<< HEAD
+=======
+# Code History
+# ------------
+>>>>>>> 53e49ee8 (add back)
 # 2025-01-22 Peter J Glckler: Created
 # 2025-02-13 Jiwoo Lee: Cleaned up
 # 2025-02-18 Jiwoo Lee: default dict to record default reference dataset per variable