Auto-merge the version-history file. (envoyproxy#3820)

See http://krlmlr.github.io/using-gitattributes-to-avoid-merge-conflicts/ Signed-off-by: Greg Greenway <ggreenway@apple.com>
repl-mike-roest · Jul 9, 2018 · 2a45375 · 2a45375
1 parent cd95109
commit 2a45375
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+/docs/root/intro/version_history.rst merge=union