From 6e258f9bdb34098dec95d35a4fceeaebfe58f27f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Fo=CC=88rtsch?= Date: Fri, 25 Aug 2017 10:11:25 +0200 Subject: [PATCH] update current version --- css/style.css | 6 ------ faq.php | 4 +++- index.php | 1 + mahlowat.php | 1 + multiplier.php | 4 +++- result.php | 6 ++---- 6 files changed, 10 insertions(+), 12 deletions(-) diff --git a/css/style.css b/css/style.css index 38ef75c..f94db33 100644 --- a/css/style.css +++ b/css/style.css @@ -43,7 +43,6 @@ body { border-color: #00CC66; } -<<<<<<< HEAD .mt-5 { margin-top: 5px; } @@ -53,8 +52,3 @@ body { .mt-50 { margin-top: 50px; } -======= -.m-t-5 { - margin-top: 5px; -} ->>>>>>> feat_9 diff --git a/faq.php b/faq.php index 9a60acd..e1ef9c8 100644 --- a/faq.php +++ b/faq.php @@ -22,8 +22,10 @@ if(isset($_POST['count'])){ - + + + diff --git a/index.php b/index.php index 4bd6624..8d612f6 100644 --- a/index.php +++ b/index.php @@ -18,6 +18,7 @@ $baseurl = "http://" . $_SERVER['SERVER_NAME'] . $uri_parts[0]; + diff --git a/mahlowat.php b/mahlowat.php index a6fffdc..6f66970 100644 --- a/mahlowat.php +++ b/mahlowat.php @@ -48,6 +48,7 @@ if(!$data_content){ + diff --git a/multiplier.php b/multiplier.php index af741e4..a0ac536 100644 --- a/multiplier.php +++ b/multiplier.php @@ -54,8 +54,10 @@ if (!$data_content) { - + + + diff --git a/result.php b/result.php index 8ee344a..d86a541 100644 --- a/result.php +++ b/result.php @@ -94,11 +94,9 @@ if(!$data_content){ - - - + - +