Merge-Überbleibsel entfernt

295b8db6 · Karl Hasselbring · 0ab7ebf6 · 295b8db6
Commit 295b8db6 authored May 11, 2018 by Karl Hasselbring
--- a/resources/assets/less/metager/result.less
+++ b/resources/assets/less/metager/result.less
@@ -50,13 +50,8 @@
            }
        }
    }
-<<<<<<< Updated upstream
    .result-body {
-        margin-top: 20px;
-=======
-    .resultpage-body {
        margin-top: 10px;
->>>>>>> Stashed changes
        .result-description {
            margin-bottom: 3px;
            word-break: break-word;