FalckJoshua / DIT113-System-Development-Locus-Imperium

Other
0 stars 0 forks source link

Bugfix #48 - [merged] #98

Closed FalckJoshua closed 7 months ago

FalckJoshua commented 1 year ago

In GitLab by @vasilena on May 4, 2023, 14:05

Merges 48-fix-merge-conflict-in-main -> main

Which bug does this MR address?

Fixes #2

Resolved the conflicts within WIOTerminal.ino
See !32

[Closes #48]

FalckJoshua commented 1 year ago

In GitLab by @vasilena on May 4, 2023, 14:05

requested review from @willand

FalckJoshua commented 1 year ago

In GitLab by @willand on May 4, 2023, 14:07

Well spotted, merging.

FalckJoshua commented 1 year ago

In GitLab by @willand on May 4, 2023, 14:07

approved this merge request

FalckJoshua commented 1 year ago

In GitLab by @willand on May 4, 2023, 14:07

enabled an automatic merge when the pipeline for 61e916cef9fa4bc76214d48eede234803f0f996c succeeds

FalckJoshua commented 1 year ago

In GitLab by @andriid on May 4, 2023, 14:08

spot on job :up: :chart_with_upwards_trend:

FalckJoshua commented 1 year ago

In GitLab by @willand on May 4, 2023, 14:08

mentioned in commit 1544b6c860cab304d3f058de24dd13013432c76b

FalckJoshua commented 1 year ago

In GitLab by @vasilena on May 4, 2023, 14:09

Thank you! :smile_cat: :handshake_tone1: