avoid conflicts in SettingsChangesHistory

This commit is contained in:
Anton Popov 2024-07-03 15:25:12 +02:00 committed by GitHub
parent d3ede543bb
commit 88601ae869
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

1
.gitattributes vendored
View File

@ -2,3 +2,4 @@ contrib/* linguist-vendored
*.h linguist-language=C++ *.h linguist-language=C++
tests/queries/0_stateless/data_json/* binary tests/queries/0_stateless/data_json/* binary
tests/queries/0_stateless/*.reference -crlf tests/queries/0_stateless/*.reference -crlf
src/Core/SettingsChangesHistory.cpp merge=union