Resolve merge conflict

This commit is contained in:
Pieter Fiers 2020-07-20 23:55:04 +02:00
commit 8978ecdae3
75 changed files with 43502 additions and 1602 deletions

View file

@ -615,9 +615,9 @@ form {
padding: 0.3em;
border-radius: 0.35em;
border: solid black 1px;
margin-left: 1em;
margin-left: 0.5em;
top: 0.2em;
position: absolute;
vertical-align: middle;
}