lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-08-08 17:42:09 +03:00
Code Activity

Remove merge conflict marker

Browse Source 
Remove a merge conflict marker that was missed in `all.sh` and was causing
building to fail.

Signed-off-by: Chris Jones <christopher.jones@arm.com>
This commit is contained in:
Chris Jones
2020-12-17 12:09:14 +00:00
parent ee33c60fc2
commit 856db5f722
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/scripts/all.sh
View File

@@ -2410,7 +2410,6 @@ component_test_no_64bit_multiplication () {
make test make test
} }
<<<<<<< HEAD
component_test_no_strings () { component_test_no_strings () {
msg "build: no strings" # ~10s msg "build: no strings" # ~10s
scripts/config.py full scripts/config.py full