Commit Graph

4 Commits

Author SHA1 Message Date
MonkeyGG2
2374905355 resolve merge conflict 2024-02-18 08:42:53 -05:00
MonkeyGG2
dea41c09d8 removed unnecessary whitespace 2024-02-18 08:40:09 -05:00
spikey
ec397c3b16 Merge branch 'main' of git.disroot.org:dvonik/omos-tcnj2024
because we are working at the same time
2024-02-18 07:59:01 -05:00
Agnosto Dvonik
5b8ab6bcab removed drv to prevent build problems 2024-02-18 07:18:55 -05:00