diff options
| author | goueslati <[email protected]> | 2023-06-12 14:27:53 +0100 |
|---|---|---|
| committer | goueslati <[email protected]> | 2023-06-12 14:27:53 +0100 |
| commit | 2d89cfb18f00aefbfa108728dfea3398e80ea3e4 (patch) | |
| tree | 6485dacac7e61c4378ac522e709edb0a86bd7523 /.github/ci/doc.sh | |
| parent | 2dd5ce83ec0421564e85b667f5dabd592f313e5c (diff) | |
| parent | ab86b060500ceda1c80e39f35af69cb08a7b63a2 (diff) | |
fix merge conflict
Diffstat (limited to '.github/ci/doc.sh')
| -rwxr-xr-x | .github/ci/doc.sh | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.github/ci/doc.sh b/.github/ci/doc.sh index 736249368..72c6465f7 100755 --- a/.github/ci/doc.sh +++ b/.github/ci/doc.sh | |||
| @@ -14,7 +14,6 @@ docserver-builder -i ./embassy-boot/boot -o crates/embassy-boot/git.zup | |||
| 14 | docserver-builder -i ./embassy-boot/nrf -o crates/embassy-boot-nrf/git.zup | 14 | docserver-builder -i ./embassy-boot/nrf -o crates/embassy-boot-nrf/git.zup |
| 15 | docserver-builder -i ./embassy-boot/rp -o crates/embassy-boot-rp/git.zup | 15 | docserver-builder -i ./embassy-boot/rp -o crates/embassy-boot-rp/git.zup |
| 16 | docserver-builder -i ./embassy-boot/stm32 -o crates/embassy-boot-stm32/git.zup | 16 | docserver-builder -i ./embassy-boot/stm32 -o crates/embassy-boot-stm32/git.zup |
| 17 | docserver-builder -i ./embassy-cortex-m -o crates/embassy-cortex-m/git.zup | ||
| 18 | docserver-builder -i ./embassy-embedded-hal -o crates/embassy-embedded-hal/git.zup | 17 | docserver-builder -i ./embassy-embedded-hal -o crates/embassy-embedded-hal/git.zup |
| 19 | docserver-builder -i ./embassy-executor -o crates/embassy-executor/git.zup | 18 | docserver-builder -i ./embassy-executor -o crates/embassy-executor/git.zup |
| 20 | docserver-builder -i ./embassy-futures -o crates/embassy-futures/git.zup | 19 | docserver-builder -i ./embassy-futures -o crates/embassy-futures/git.zup |