fix merge conflict

This commit is contained in:
mlorb 2018-03-20 14:30:07 +01:00
parent 884eef9d07
commit 9cf9bf94c0

View file

@ -368,6 +368,7 @@
#content-wrapper {
margin-top: 50px;
margin-left: 83px;
}