Mirrors/trezor-suite
2
0
Fork 0
mirror of https://github.com/trezor/trezor-suite.git synced 2026-02-20 00:33:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat(git): instruct git to union conflicts in CHANGELOG.md

Browse Source
This commit is contained in:
Tomas Susanka
2021-02-15 12:06:10 +01:00
committed by Maroš
parent f37c075173
commit 90d46975fa
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitattributes vendored
View File

@@ -1,3 +1,4 @@
# lfs files
packages/suite-data/files/bin/bridge/linux-*/trezord filter=lfs diff=lfs merge=lfs -text
packages/suite-data/files/bin/bridge/mac-*/trezord filter=lfs diff=lfs merge=lfs -text
packages/suite-data/files/bin/bridge/win-*/trezord.exe filter=lfs diff=lfs merge=lfs -text
@@ -8,3 +9,6 @@ packages/suite-data/files/bin/tor/mac-*/tor filter=lfs diff=lfs merge=lfs -text
packages/suite-data/files/bin/tor/win-*/*.dll filter=lfs diff=lfs merge=lfs -text
packages/suite-data/files/bin/tor/win-*/tor.exe filter=lfs diff=lfs merge=lfs -text
packages/integration-tests/projects/suite-web/snapshots/** filter=lfs diff=lfs merge=lfs -text
# Changelog to be merged via union always.
CHANGELOG.md merge=union