This is an automated email from the ASF dual-hosted git repository. mssun pushed a commit to branch rww-doc in repository https://gitbox.apache.org/repos/asf/incubator-teaclave-trustzone-sdk.git
commit 961eb8d7f4cd78d142cabbfd8f56cc2345713fdc Author: rmheng <[email protected]> AuthorDate: Tue Oct 19 03:45:00 2021 +0000 modify docs/README.md --- docs/README.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/docs/README.md b/docs/README.md index 869c82f..cf8bcfa 100644 --- a/docs/README.md +++ b/docs/README.md @@ -4,12 +4,6 @@ permalink: /trustzone-sdk-docs # Teaclave TrustZone SDK Documentation -<<<<<<< HEAD * [Getting Started with OPTEE for QEMU ARMv8](getting-started-with-optee-for-qemu-armv8.md) * [Overview of OP-TEE Rust Examples](overview-of-optee-rust-examples.md) -* [Debug OP-TEE TA](debug-optee-ta.md) -======= -* [Getting Started with OPTEE for QEMU ARMv8](/trustzone-sdk-docs/getting-started-with-optee-for-qemu-armv8) -* [Overview of OP-TEE Rust Examples](/trustzone-sdk-docs/overview-of-optee-rust-examples) -* [Debug OP-TEE TA](debugging-optee-ta.md) ->>>>>>> modify according to comments +* [Debugging OP-TEE TA](debugging-optee-ta.md) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
