mirror of https://github.com/OpenIPC/firmware.git
Fix merge error
parent
72e5c78912
commit
8b776b5b89
|
@ -28,26 +28,12 @@ jobs:
|
|||
fail-fast: false
|
||||
matrix:
|
||||
platform:
|
||||
<<<<<<< HEAD
|
||||
- hi3516av100
|
||||
- hi3516cv200
|
||||
- hi3519v101
|
||||
- hi3516cv300
|
||||
- hi3516cv500
|
||||
- hi3516ev200
|
||||
# hi3516cv200
|
||||
# hi3516cv300
|
||||
# hi3516cv500
|
||||
# hi3516ev200
|
||||
=======
|
||||
- hi3516cv200
|
||||
- hi3516cv300
|
||||
- hi3516cv500
|
||||
- hi3516ev200
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> 97bedb13 ([ci skip] Disable everything else)
|
||||
=======
|
||||
>>>>>>> 97bedb13239ea784bc2c7b5e6f62363efcb9330e
|
||||
- ak3918ev300
|
||||
- gk7102
|
||||
|
||||
|
|
Loading…
Reference in New Issue