Skip to content
Snippets Groups Projects
Commit 295b8db6 authored by Karl Hasselbring's avatar Karl Hasselbring
Browse files

Merge-Überbleibsel entfernt

parent 0ab7ebf6
No related branches found
No related tags found
2 merge requests!1262WIP: Resolve "Spendenseite Texte anpassen",!1215Resolve "Fehlende Quellen bei Quicktips"
Hide whitespace changes
Inline Side-by-side
resources/assets/less/metager/result.less
+ 0
− 5
View file @ 295b8db6
...@@ -50,13 +50,8 @@ ...@@ -50,13 +50,8 @@
} }
} }
} }
<<<<<<< Updated upstream
.result-body { .result-body {
margin-top: 20px;
=======
.resultpage-body {
margin-top: 10px; margin-top: 10px;
>>>>>>> Stashed changes
.result-description { .result-description {
margin-bottom: 3px; margin-bottom: 3px;
word-break: break-word; word-break: break-word;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment