fix merge conflict

This commit is contained in:
David Ralph
2020-10-27 12:06:21 +00:00
9 changed files with 36 additions and 26 deletions

View File

@@ -29,16 +29,6 @@ body {
outline: none;
}
@font-face {
font-family: 'Lexend Deca';
src: url('/./fonts/LexendDeca-Regular.woff2') format('woff2');
}
@font-face {
font-family: 'Roboto';
src: url('/./fonts/Roboto-Cyrillic.woff2') format('woff2');
}
#center {
margin-left: 2vw;
margin-right: 2vw;