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

See http://krlmlr.github.io/using-gitattributes-to-avoid-merge-conflicts/

Signed-off-by: Greg Greenway <f58b4fce410ab27c1d5cc4afd1f2a190e9aa65c3@apple.com>
envoyproxy/envoy-wasm,eklitzke/envoy,envoyproxy/envoy-wasm,envoyproxy/envoy,lizan/envoy,dnoe/envoy,lizan/envoy,lizan/envoy,istio/envoy,envoyproxy/envoy,dnoe/envoy,jrajahalme/envoy,envoyproxy/envoy,jrajahalme/envoy,lyft/envoy,envoyproxy/envoy,lizan/envoy,eklitzke/envoy,jrajahalme/envoy,dnoe/envoy,envoyproxy/envoy-wasm,istio/envoy,envoyproxy/envoy,istio/envoy,lizan/envoy,envoyproxy/envoy-wasm,dnoe/envoy,envoyproxy/envoy,lyft/envoy,envoyproxy/envoy,envoyproxy/envoy-wasm,jrajahalme/envoy,istio/envoy,istio/envoy,lyft/envoy,istio/envoy,envoyproxy/envoy,lizan/envoy,envoyproxy/envoy,eklitzke/envoy,jrajahalme/envoy,lyft/envoy,istio/envoy,envoyproxy/envoy-wasm,eklitzke/envoy,envoyproxy/envoy-wasm,lyft/envoy,eklitzke/envoy,envoyproxy/envoy,jrajahalme/envoy,lyft/envoy,dnoe/envoy,eklitzke/envoy,envoyproxy/envoy,envoyproxy/envoy