fix: resolve conflict

This commit is contained in:
Cory Dransfeldt 2024-03-17 15:15:44 -07:00
parent 5aa00bb148
commit 5ec0873695
No known key found for this signature in database
7 changed files with 133 additions and 3 deletions

View file

@ -0,0 +1,13 @@
@font-face {
font-family: Poppins;
src: url('/assets/fonts/Poppins-Bold.woff2') format("woff2");
font-weight: 700;
font-display: swap;
}
@font-face {
font-family: Poppins;
src: url('/assets/fonts/Poppins-Regular.woff2') format("woff2");
font-weight: 400;
font-display: swap;
}