(deleted):master
master
Deletes unresolved conflict merge request lines mixed up in .gitignore.
Also adds icons/* to .gitignore.
banner/* !banner/*default*
is important, I only want to push the default banner by default
I'm deleting only repeated and invalid lines. banner/* and !banner/*default* will still be in .gitignore after merge, on lines 22 and 26
banner/*
!banner/*default*
.gitignore
Oh yeah mb, gitea wasn't showing the full thing, thank you for your time
No dependencies set.
The note is not visible to the blocked user.
Deletes unresolved conflict merge request lines mixed up in .gitignore.
Also adds icons/* to .gitignore.
Clean .gitignoreto Clean .gitignore and ignore icons/*is important, I only want to push the default banner by default
I'm deleting only repeated and invalid lines.
banner/*and!banner/*default*will still be in.gitignoreafter merge, on lines 22 and 26Oh yeah mb, gitea wasn't showing the full thing, thank you for your time