one more adjustment

USEPA · Mar 30, 2021 · c1c354b · c1c354b
1 parent f1f3651
commit c1c354b
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,5 @@
-<<<<<<< HEAD
 .Rproj.user
 .Rhistory
 .RData
 .Ruserdata
-=======
 lake_cat_config.py
->>>>>>> 6855ebd44f8253ab82168173af248a140c6b3ba6