Skip to content

Commit e98fd91

Browse files
committed
revert merge changes to sync
1 parent c9d199b commit e98fd91

File tree

72 files changed

+32
-228
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+32
-228
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,6 @@ jobs:
129129
cpp_tests:
130130
needs: [configure, setup_rust]
131131
runs-on: ubuntu-latest
132-
container:
133-
image: zondax/rust-ci:latest
134132
steps:
135133
- name: Checkout
136134
uses: actions/checkout@v4
@@ -190,7 +188,7 @@ jobs:
190188
- name: Checkout
191189
uses: actions/checkout@v4
192190
with:
193-
submodules: recursive
191+
submodules: true
194192
- name: Install deps
195193
run: pip install ledgerblue --break-system-packages
196194
- name: Setup Rust environment
@@ -246,7 +244,7 @@ jobs:
246244
- name: Checkout
247245
uses: actions/checkout@v4
248246
with:
249-
submodules: recursive
247+
submodules: true
250248
- name: Install deps
251249
run: pip install ledgerblue --break-system-packages
252250
- name: Setup Rust environment

app/src/addr.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
extern "C" {
2121
#endif
2222
#include <stdint.h>
23+
2324
#include "zxerror.h"
2425

2526
/// Return the number of items in the address view

js/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
"@babel/plugin-transform-runtime": "^7.12.10",
3333
"@babel/preset-env": "^7.12.11",
3434
"@blockstack/prettier-config": "^0.0.6",
35-
"@types/ledgerhq__hw-transport": "^4.21.4",
3635
"babel-eslint": "^10.1.0",
3736
"bip32": "^2.0.6",
3837
"bip39": "^3.0.2",
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)