mirror of
https://github.com/realm/SwiftLint.git
synced 2026-05-07 20:12:49 +00:00
JP Simard
99f6430838
this should resolve conflicts more sensibly See https://about.gitlab.com/2015/02/10/gitlab-reduced-merge-conflicts-by-90-percent-with-changelog-placeholders/ for details
2 lines
25 B
Plaintext
2 lines
25 B
Plaintext
CHANGELOG.md merge=union
|