Automatically merge CHANGES.rst

pinax · Oct 29, 2020 · 89b1e2d · 89b1e2d
1 parent 9b84d68
commit 89b1e2d
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+CHANGES.rst merge=union