fix: resolve conflict

Browse source

...

This commit is contained in:

Cory Dransfeldt 2024-03-17 16:41:46 -07:00

parent 50717ef665

commit 249f0fc75c

No known key found for this signature in database

9 changed files with 8 additions and 23 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

BIN

src/assets/fonts/Poppins-Bold.woff2

View file

Binary file not shown.

BIN

src/assets/fonts/Poppins-Regular.woff2

View file

Binary file not shown.