mcu-debug / rtos-views

RTOS views for microcontrollers
MIT License
24 stars 11 forks source link

Format whole code #23

Closed PhilippHaefele closed 1 year ago

PhilippHaefele commented 1 year ago
haneefdm commented 1 year ago

Oh no, we have a merge conflict because I had just pushed some changes. The package-lock can be regenerated but github will refuse to merge unless the conflicts can be resolved. package.json has important updates in it.

Do you know how to proceed?

haneefdm commented 1 year ago

I panicked for no reason. Edits were simple