mirror of
https://git.selfprivacy.org/SelfPrivacy/selfprivacy.org.git
synced 2025-01-15 13:26:37 +00:00
fix: bad merge
This commit is contained in:
parent
27ac23f9ac
commit
8345296280
|
@ -144,7 +144,6 @@ li:has(input[type="checkbox"]) {
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
}
|
}
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
.tab-content {
|
.tab-content {
|
||||||
.tab-pane {
|
.tab-pane {
|
||||||
border: none !important;
|
border: none !important;
|
||||||
|
@ -183,8 +182,6 @@ li:has(input[type="checkbox"]) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
=======
|
|
||||||
>>>>>>> upstream/master
|
|
||||||
@media (min-width: 768px) {
|
@media (min-width: 768px) {
|
||||||
.td-sidebar {
|
.td-sidebar {
|
||||||
padding-top: 5rem;
|
padding-top: 5rem;
|
||||||
|
|
Loading…
Reference in a new issue