Merge pull request #28 from UM-LPM/main

Create .gitattributes
UM-LPM · May 6, 2024 · df6da9d · df6da9d
2 parents c22195f + bb78ed5
commit df6da9d
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+_config.yml merge=ours
+courses/* merge=ours