From 8b776b5b89294827c52281396cca7ae0feffe4cf Mon Sep 17 00:00:00 2001
From: Dmitry Ilyin <dima@doty.ru>
Date: Sat, 20 Aug 2022 21:55:35 +0300
Subject: [PATCH] Fix merge error

---
 .github/workflows/matrix_build.yml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/.github/workflows/matrix_build.yml b/.github/workflows/matrix_build.yml
index 55281c58..b28ece76 100644
--- a/.github/workflows/matrix_build.yml
+++ b/.github/workflows/matrix_build.yml
@@ -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