add merge=union strategy for ChangeLog.md

PrairieLearn · Apr 25, 2018 · a1c9094 · a1c9094
1 parent 5471195
commit a1c9094
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -3,3 +3,4 @@
 * text=auto
 
 *.sh text eol=lf
+ChangeLog.md merge=union
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -82,6 +82,7 @@
   * Add `pl_integer_input` element (Tim Bretl).
 
   * Add consistency checks for `course_instance_id` in `variants` (Matt West).
+  * Add `merge=union` strategy for `ChangeLog.md` (Matt West).
 
   * Fix broken file upload element (Nathan Walters).