From 2908c617f2331b05e97cfd6cffce3aa0a6a28cd8 Mon Sep 17 00:00:00 2001 From: Martin Varmuza Date: Mon, 18 Nov 2024 14:40:16 +0100 Subject: [PATCH] chore(repo): reorganize lines in .gitattributes --- .gitattributes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitattributes b/.gitattributes index a16dc931526..016779fef82 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10,10 +10,10 @@ packages/suite-data/files/bin/tor/win-*/*.dll filter=lfs diff=lfs merge=lfs -tex packages/suite-data/files/bin/tor/win-*/tor.exe filter=lfs diff=lfs merge=lfs -text packages/connect-common/files/firmware/*/*.bin filter=lfs diff=lfs merge=lfs -text packages/connect-common/files/devkit/firmware/*/*.bin filter=lfs diff=lfs merge=lfs -text -# Changelog to be merged via union always. -CHANGELOG.md merge=union packages/suite-data/files/bin/coinjoin/linux-arm64/WalletWasabi.WabiSabiClientLibrary filter=lfs diff=lfs merge=lfs -text packages/suite-data/files/bin/coinjoin/linux-x64/WalletWasabi.WabiSabiClientLibrary filter=lfs diff=lfs merge=lfs -text packages/suite-data/files/bin/coinjoin/osx-arm64/WalletWasabi.WabiSabiClientLibrary filter=lfs diff=lfs merge=lfs -text packages/suite-data/files/bin/coinjoin/osx-x64/WalletWasabi.WabiSabiClientLibrary filter=lfs diff=lfs merge=lfs -text packages/suite-data/files/bin/coinjoin/win-x64/WalletWasabi.WabiSabiClientLibrary.exe filter=lfs diff=lfs merge=lfs -text +# Changelog to be merged via union always. +CHANGELOG.md merge=union