Fix conflict

This commit is contained in:
Dapoolp 2025-07-31 11:54:36 +02:00
commit dbb07008f0
677 changed files with 67498 additions and 579 deletions

View file

@ -24,6 +24,12 @@
@medium-red-10: #D0474710;
@medium-red-40: #D0474740;
@dark-golden: #2b1d03;
@dark-golden-80: #2b1d0380;
@red: #e54e4e;
@red-10: #e54e4e10;
@red-40: #e54e4e40;
@dark-red: #3c0000;
@dark-red-10: #3c000010;