Fix merge error

pull/385/head
Dmitry Ilyin 2022-08-20 21:55:35 +03:00
parent 72e5c78912
commit 8b776b5b89
1 changed files with 0 additions and 14 deletions

View File

@ -28,26 +28,12 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
platform: platform:
<<<<<<< HEAD
- hi3516av100 - hi3516av100
- hi3516cv200 - hi3516cv200
- hi3519v101 - hi3519v101
- hi3516cv300 - hi3516cv300
- hi3516cv500 - hi3516cv500
- hi3516ev200 - hi3516ev200
# hi3516cv200
# hi3516cv300
# hi3516cv500
# hi3516ev200
=======
- hi3516cv200
- hi3516cv300
- hi3516cv500
- hi3516ev200
<<<<<<< HEAD
>>>>>>> 97bedb13 ([ci skip] Disable everything else)
=======
>>>>>>> 97bedb13239ea784bc2c7b5e6f62363efcb9330e
- ak3918ev300 - ak3918ev300
- gk7102 - gk7102