From 295b8db6638bb474c50715c31c6758ecd85b6810 Mon Sep 17 00:00:00 2001
From: Karl Hasselbring <Karl Hasselbring>
Date: Fri, 11 May 2018 08:44:41 +0200
Subject: [PATCH] =?UTF-8?q?Merge-=C3=9Cberbleibsel=20entfernt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
resources/assets/less/metager/result.less | 5 -----
1 file changed, 5 deletions(-)
diff --git a/resources/assets/less/metager/result.less b/resources/assets/less/metager/result.less
index c72869711..59a9279ea 100644
--- 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;
--
GitLab