Skip to content

Commit

Permalink
Fix submodule rebase error (#14529)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jmartinez-silabs @pull
jmartinez-silabs authored and pull[bot] committed Jul 31, 2023
1 parent bfeaee5 commit 5256312
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion third_party/efr32_sdk/repo
Submodule repo updated 20 files
+13 −6 matter/efr32/sl_device_init_clocks.c
+966 −0 ...piflash-single/efr32mg12p332f1024gl125-brd4166a/bootloader-storage-spiflash-single-1024k-4166A-combined.s37
+873 −0 ...age-spiflash-single/efr32mg12p332f1024gl125-brd4166a/bootloader-storage-spiflash-single-1024k-4166A-crc.s37
+873 −0 ...storage-spiflash-single/efr32mg12p332f1024gl125-brd4166a/bootloader-storage-spiflash-single-1024k-4166A.s37
+898 −0 ...piflash-single/efr32mg12p432f1024gl125-brd4161a/bootloader-storage-spiflash-single-1024k-4161A-combined.s37
+805 −0 ...age-spiflash-single/efr32mg12p432f1024gl125-brd4161a/bootloader-storage-spiflash-single-1024k-4161A-crc.s37
+804 −0 ...storage-spiflash-single/efr32mg12p432f1024gl125-brd4161a/bootloader-storage-spiflash-single-1024k-4161A.s37
+898 −0 ...piflash-single/efr32mg12p433f1024gl125-brd4164a/bootloader-storage-spiflash-single-1024k-4164A-combined.s37
+805 −0 ...age-spiflash-single/efr32mg12p433f1024gl125-brd4164a/bootloader-storage-spiflash-single-1024k-4164A-crc.s37
+804 −0 ...storage-spiflash-single/efr32mg12p433f1024gl125-brd4164a/bootloader-storage-spiflash-single-1024k-4164A.s37
+898 −0 ...spiflash-single/efr32mg12p433f1024gm68-brd4170a/bootloader-storage-spiflash-single-1024k-4170A-combined.s37
+805 −0 ...rage-spiflash-single/efr32mg12p433f1024gm68-brd4170a/bootloader-storage-spiflash-single-1024k-4170A-crc.s37
+804 −0 ...-storage-spiflash-single/efr32mg12p433f1024gm68-brd4170a/bootloader-storage-spiflash-single-1024k-4170A.s37
+765 −0 ...rage-spiflash-single/efr32mg24a010f1536gm48-brd4186a/bootloader-storage-spiflash-single-1024k-4186A-crc.s37
+764 −0 ...-storage-spiflash-single/efr32mg24a010f1536gm48-brd4186a/bootloader-storage-spiflash-single-1024k-4186A.s37
+765 −0 ...rage-spiflash-single/efr32mg24a020f1536gm48-brd4187a/bootloader-storage-spiflash-single-1024k-4187A-crc.s37
+764 −0 ...-storage-spiflash-single/efr32mg24a020f1536gm48-brd4187a/bootloader-storage-spiflash-single-1024k-4187A.s37
+898 −0 ...torage-spiflash-single/mgm12p32f1024ga-brd4304a/bootloader-storage-spiflash-single-1024k-4304A-combined.s37
+805 −0 ...der-storage-spiflash-single/mgm12p32f1024ga-brd4304a/bootloader-storage-spiflash-single-1024k-4304A-crc.s37
+804 −0 ...tloader-storage-spiflash-single/mgm12p32f1024ga-brd4304a/bootloader-storage-spiflash-single-1024k-4304A.s37
2 changes: 1 addition & 1 deletion third_party/zap/repo
Submodule repo updated 8 files
+164 −59 src-electron/db/query-command.js
+4 −0 src-electron/generator/helper-endpointconfig.js
+175 −37 src-electron/generator/helper-session.js
+4 −0 src-electron/validation/validation.js
+5 −0 test/gen-template/zigbee/gen-templates.json
+6 −0 test/gen-template/zigbee/zap-outgoing-command.zapt
+8 −0 test/gen-zigbee.test.js
+1 −1 test/test-util.js

0 comments on commit 5256312

Please sign in to comment.