Skip to content

Commit 88601ae

Browse files
CurtizJCurtizJ
authored
avoid conflicts in SettingsChangesHistory
1 parent d3ede54 commit 88601ae

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

‎.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ contrib/* linguist-vendored
22
*.h linguist-language=C++
33
tests/queries/0_stateless/data_json/* binary
44
tests/queries/0_stateless/*.reference -crlf
5+
src/Core/SettingsChangesHistory.cpp merge=union

0 commit comments

Comments
 (0)