Skip to content

Commit 34e13ef

Browse files
committed
Fixed merge conflicts
2 parents 63e9c33 + d4c80b4 commit 34e13ef

113 files changed

Lines changed: 2939 additions & 2545 deletions

File tree

Some content is hidden

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

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ jobs:
3434
container: null
3535
runs-on: ${{ matrix.runner }}
3636
container: ${{ matrix.container }}
37+
timeout-minutes: 120
3738
env:
3839
CARGO_TARGET_DIR: ${{ github.workspace }}/target
3940
steps:

0 commit comments

Comments
 (0)