From 1c87d0a345492a9d71fd88f335c896db568ce45b Mon Sep 17 00:00:00 2001 From: Fabian Eichhorner Date: Sun, 20 Jan 2019 20:58:12 +0100 Subject: [PATCH] fixed merge conflicts --- service-website/src/components/PdfReport.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/service-website/src/components/PdfReport.js b/service-website/src/components/PdfReport.js index a147fee..200971a 100644 --- a/service-website/src/components/PdfReport.js +++ b/service-website/src/components/PdfReport.js @@ -26,14 +26,13 @@ const PdfReport = ({pdfLink, loading}) => { return (
-
-
-
-
-
+
+
+
+
+
- - ); +
); } else { return null; } -- 2.43.0