From 188a18976c791b88dca9decdb462ff53ec066968 Mon Sep 17 00:00:00 2001 From: bunnie Date: Thu, 21 Apr 2022 17:57:42 +0800 Subject: [PATCH] clean up merge conflicts --- xtask/src/main.rs | 3 --- 1 file changed, 3 deletions(-) diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 02c62dbb2..e22240d09 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -619,11 +619,8 @@ Various debug configurations: 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 tts builds an image with text to speech support via externally linked C executable -<<<<<<< HEAD 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 ->>>>>>> origin/main " ) }