chore: git stuff

ecmwf · Sep 12, 2024 · 189fffc · 189fffc
1 parent a15a85b
commit 189fffc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+CHANGELOG.md merge=union
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,6 @@ _build/
 ?
 ?.*
 ~*
+
+# Environments
+.envrc
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,3 +2,6 @@ _build/ @@
     ?
     ?.*
     ~*
+    # Environments
+    .envrc