From 37f5922bf84a4c09cfc9815d2fd50782e8658da4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 27 Jan 2020 01:38:50 +0100
Subject: [PATCH] Fix conflict

---
 htdocs/takepos/css/pos.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/takepos/css/pos.css b/htdocs/takepos/css/pos.css
index 5e32381d0a5..39862f13535 100644
--- a/htdocs/takepos/css/pos.css
+++ b/htdocs/takepos/css/pos.css
@@ -259,7 +259,7 @@ div.paymentbordline
 	float: left;
 	box-sizing: border-box;
 	padding-top: 0;
-	padding-bottom: 10px;
+	padding-bottom: 0;
 	padding-right: 5px;
 	padding-left: 5px;
 }