Union merging for CHANGES.txt
Union merging for CHANGES.txt

https://about.gitlab.com/2015/02/10/gitlab-reduced-merge-conflicts-by-90-percent-with-changelog-placeholders/

Signed-off-by: Chris Warrick <de6f931166e131a07f31c96c765aee08f061d1a5@gmail.com>

getnikola/nikola,okin/nikola,getnikola/nikola,getnikola/nikola,okin/nikola,okin/nikola,okin/nikola,getnikola/nikola