Merge remote-tracking branch 'origin/master'

into gshep/issue-1049 Conflicts: pallets/usage/src/offchain.rs
gear-tech · Jun 18, 2022 · bdf5b29 · bdf5b29
2 parents aec889e + 8dc145c
commit bdf5b29
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
@@ -233,7 +233,7 @@ jobs:
           issue-number: ${{ github.event.pull_request.number }}
           body: |
             <details><summary>${{ github.event.pull_request.head.sha }}</summary>
-            <details><summary>Pallet tests (values are in nanosegconds)</summary>
+            <details><summary>Pallet tests (values are in nanoseconds)</summary>
 
             ${{ steps.test-performance-pallets.outputs.body }}
             </details>

diff --git a/Cargo.lock b/Cargo.lock