Skip to content

Commit

Permalink
Merge branch 'main' into pmd
Browse files Browse the repository at this point in the history
  • Loading branch information
@brokenpylons
brokenpylons committed May 6, 2024
2 parents c22195f + 8162b91 commit 1afed1d
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
_config.yml merge=ours
courses/* merge=ours

0 comments on commit 1afed1d

Please sign in to comment.