Merge branch 'master' into withmergeresolve

This commit is contained in:
Chaos Rogers 2025-07-21 14:25:00 +01:00 committed by GitHub
commit bbb5334202
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 1 additions and 3 deletions

2
.gitignore vendored
View file

@ -19,8 +19,6 @@ mono_crash.*
# Build results # Build results
[Dd]ebug/ [Dd]ebug/
[Dd]ebugPublic/ [Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
x64/ x64/
x86/ x86/
[Ww][Ii][Nn]32/ [Ww][Ii][Nn]32/

View file

@ -1,4 +1,4 @@
// src/ui.rs // src/ui.rs
use std::{ use std::{
io::{stdout, Write}, io::{stdout, Write},