diff options
| author | Konstantin Ullrich <konstantinullrich12@gmail.com> | 2024-10-07 12:37:30 +0200 |
|---|---|---|
| committer | Konstantin Ullrich <konstantinullrich12@gmail.com> | 2024-10-07 12:37:30 +0200 |
| commit | 98272ee381bd07081502dd426226f58c879300a6 (patch) | |
| tree | 672f6f06727dbc1c84270973ce13e9403913e481 /apply_patches.sh | |
| parent | 04b29d84a2c368c677cf5ec946269203622ca170 (diff) | |
| parent | 67f4baa015a4407d096e35b6e5a81d72932fb55f (diff) | |
Merge branch 'master' into ledger
# Conflicts:
# .github/workflows/full_check.yaml
# impls/monero.dart/lib/monero.dart
# impls/monero.dart/pubspec.yaml
# patches/monero/0016-add-dummy-device-for-ledger.patch
Diffstat (limited to 'apply_patches.sh')
| -rwxr-xr-x | apply_patches.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apply_patches.sh b/apply_patches.sh index 3ce6856..22c3bba 100755 --- a/apply_patches.sh +++ b/apply_patches.sh @@ -31,7 +31,7 @@ fi set -e cd $repo -git am -3 ../patches/$repo/*.patch +git am -3 --whitespace=fix --reject ../patches/$repo/*.patch if [[ "$repo" == "wownero" ]]; then pushd external/randomwow |