Fix merge conflicts

This commit is contained in:
hiro 2020-10-20 15:02:44 +02:00
commit 7d50bd30a2
4 changed files with 10 additions and 2 deletions

View File

@ -799,3 +799,9 @@
}
}
}
.donor-faq {
li {
font-size: 30px;
}
}

View File

@ -8,7 +8,6 @@
}
/* Reset */
.no-border {
border: none;
}

View File

@ -8830,6 +8830,9 @@ a.side-nav.active {
.donate-page .thank-you .btn {
text-transform: uppercase; }
.donor-faq li {
font-size: 30px; }
.cryptocurrency {
padding-top: 40px;
display: flex;

File diff suppressed because one or more lines are too long