Skip to content

Commit

Permalink
Rebase master.
Browse files Browse the repository at this point in the history
  • Loading branch information
krypton36 committed Oct 29, 2021
1 parent 1cffed1 commit 14b9d81
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 167 deletions.
3 changes: 0 additions & 3 deletions examples/chip-tool/templates/tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,21 +68,18 @@ function getTests()

const MediaControl = [
'Test_TC_MC_1_1',
<<<<<<< HEAD
'Test_TC_MC_2_1',
'Test_TC_MC_3_1',
'Test_TC_MC_3_2',
'Test_TC_MC_3_3',
'Test_TC_MC_3_4',
'Test_TC_MC_3_5',
=======
'Test_TC_MC_3_6',
'Test_TC_MC_3_7',
'Test_TC_MC_3_8',
'Test_TC_MC_3_9',
'Test_TC_MC_3_10',
'Test_TC_MC_3_11',
>>>>>>> 89bdaca2a9a72ca4387de0f8bab410a5802c383b
];

const OnOff = [
Expand Down
3 changes: 0 additions & 3 deletions src/darwin/Framework/CHIP/templates/tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,21 +68,18 @@ function getTests()

const MediaControl = [
'Test_TC_MC_1_1',
<<<<<<< HEAD
'Test_TC_MC_2_1',
'Test_TC_MC_3_1',
'Test_TC_MC_3_2',
'Test_TC_MC_3_3',
'Test_TC_MC_3_4',
'Test_TC_MC_3_5',
=======
'Test_TC_MC_3_6',
'Test_TC_MC_3_7',
'Test_TC_MC_3_8',
'Test_TC_MC_3_9',
'Test_TC_MC_3_10',
'Test_TC_MC_3_11',
>>>>>>> 89bdaca2a9a72ca4387de0f8bab410a5802c383b
];

const OnOff = [
Expand Down
20 changes: 0 additions & 20 deletions src/darwin/Framework/CHIPTests/CHIPClustersTests.m

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 14b9d81

Please sign in to comment.