Fixing merge conflicts

This commit is contained in:
2019-10-11 17:58:55 -04:00
3 changed files with 31 additions and 13 deletions

View File

@@ -1,3 +1,7 @@
html,
body {
background-color: rgb(245, 245, 245);
}
.app {
font-family: "Segoe UI";
font-size: large;