From cbc5fd2854d145c50259e8c7793ea2488a8ea96a Mon Sep 17 00:00:00 2001
From: jhuesser <github@jhuesser.ch>
Date: Tue, 31 Jul 2018 11:17:33 +0200
Subject: [PATCH] some fixes (still dont work)

---
 install.php | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/install.php b/install.php
index 87ed869..a9d0c06 100644
--- a/install.php
+++ b/install.php
@@ -242,7 +242,6 @@ if (!empty($message))
 			<div class="col-sm-6"><label for="address"><?php echo _("Address");?>: </label><input type="text" name="address" value="<?php echo ((isset($_POST['address']))?htmlspecialchars($_POST['address'], ENT_QUOTES):'');?>" id="address" placeholder="<?php echo _("Full address");?>" class="form-control" required></div>
 		</div>
 		<div class="form-group clearfix">
-<<<<<<< HEAD
 			<div class="col-sm-6"><label for="policy_mail"><?php echo _("E-Mail");?>: </label><input type="text" name="policy_mail" value="<?php echo ((isset($_POST['policy_mail']))?htmlspecialchars($_POST['policy_mail'], ENT_QUOTES):'');?>" id="policy_mail" placeholder="<?php echo _("E-Mail");?>" class="form-control" required></div>
 			<div class="col-sm-6"><label for="policy_phone"><?php echo _("Phone");?>: </label><input type="text" name="policy_phone" value="<?php echo ((isset($_POST['policy_phone']))?htmlspecialchars($_POST['policy_phone'], ENT_QUOTES):'');?>" id="policy_phone" placeholder="<?php echo _("Phone number");?>" class="form-control"></div>
 		</div>
@@ -256,14 +255,6 @@ if (!empty($message))
 		<div class="form-group clearfix">
 			<div class="col-sm-6"><label for="tgtoken"><?php echo _("Telegram bot API Token");?>: </label><input type="text" name="tgtoken" value="<?php echo ((isset($_POST['tgtoken']))?htmlspecialchars($_POST['tgtoken'], ENT_QUOTES):'');?>" id="tgtoken" placeholder="<?php echo _("Telegram Bot API Token");?>" class="form-control" required></div>
 			<div class="col-sm-6"><label for="tgbot"><?php echo _("Telegram Bot Username");?>: </label><input type="text" name="tgbot" value="<?php echo ((isset($_POST['tgbot']))?htmlspecialchars($_POST['tgbot'], ENT_QUOTES):'');?>" id="tgbot" placeholder="<?php echo _("Telegram Bot Username");?>" class="form-control" required></div>
-=======
-			<div class="col-sm-6"><label for="policy_mail"><?php echo _("E-Mail");?>: </label><input type="text" name="policy-mail" value="<?php echo ((isset($_POST['policy-mail']))?htmlspecialchars($_POST['policy-mail'], ENT_QUOTES):'');?>" id="policy-mail" placeholder="<?php echo _("E-Mail");?>" class="form-control" required></div>
-			<div class="col-sm-6"><label for="policy_phone"><?php echo _("Phone");?>: </label><input type="text" name="policy_phone" value="<?php echo ((isset($_POST['policy_phone']))?htmlspecialchars($_POST['policy_phone'], ENT_QUOTES):'');?>" id="policy_phone" placeholder="<?php echo _("Phone number");?>" class="form-control"></div>
-		</div>
-		<div class="form-group clearfix">
-			<div class=""><label for="who_we_are"><?php echo _("Who we are");?>: </label><textarea class="form-control" id="who_we-are" rows="3" name="who-we-are" placeholder="<?php echo _("A small text about yourself");?>" value="<?php echo ((isset($_POST['who-we-are']))?htmlspecialchars($_POST['who-we-are'], ENT_QUOTES):'');?>"></textarea></div>
->>>>>>> after work commit [not working]
-		</div>
 	</section>		
 	<section class="install-section clearfix">
 		<div class="form-group clearfix">