Merge pull request #1184 from influxdata/no-more-changelog-conflicts
Resolve CHANGELOG.md conflicts by keeping both changespull/1187/head
commit
324987a753
|
@ -0,0 +1 @@
|
|||
CHANGELOG.md merge=union
|
Loading…
Reference in New Issue