ports/nrf/modules/os/microbitfs.c: Fix wrong conflict resolution. · Infineon/micropython@e7a1f75

Triggered via push January 23, 2024 08:07

ports-psoc6-main

Status Success

Total duration 8m 26s

Artifacts 2

ports_psoc6.yml

on: push

Matrix: server-build

Matrix: on-target-test

Matrix: release

Produced during runtime

Name	Size
mpy-psoc6_CY8CPROTO-062-4343W_e7a1f75 Expired	3.63 MB
mpy-psoc6_CY8CPROTO-063-BLE_e7a1f75 Expired	1.47 MB