mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
clean up merge conflicts
This commit is contained in:
parent
c3e5b23dd3
commit
188a18976c
1 changed files with 0 additions and 3 deletions
|
|
@ -619,11 +619,8 @@ Various debug configurations:
|
||||||
pddb-ci PDDB config for CI testing (eg: TRNG->deterministic for reproducible errors)
|
pddb-ci PDDB config for CI testing (eg: TRNG->deterministic for reproducible errors)
|
||||||
ffi-test builds an image for testing C-FFI bindings and integration
|
ffi-test builds an image for testing C-FFI bindings and integration
|
||||||
tts builds an image with text to speech support via externally linked C executable
|
tts builds an image with text to speech support via externally linked C executable
|
||||||
<<<<<<< HEAD
|
|
||||||
usbdev minimal, insecure build for new USB core bringup
|
usbdev minimal, insecure build for new USB core bringup
|
||||||
=======
|
|
||||||
install-toolkit installs Xous toolkit with no prompt, useful in CI. Specify `--force` to remove existing toolchains
|
install-toolkit installs Xous toolkit with no prompt, useful in CI. Specify `--force` to remove existing toolchains
|
||||||
>>>>>>> origin/main
|
|
||||||
"
|
"
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue