From cbefb2dda8746dfc756ae8b2e34039457c6c9253 Mon Sep 17 00:00:00 2001 From: Krzysztof Piasecki Date: Sat, 28 Jan 2017 09:36:05 +0100 Subject: [PATCH] Remove merge marker --- production/form.html | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/production/form.html b/production/form.html index d0ff92c3..c8a30737 100755 --- a/production/form.html +++ b/production/form.html @@ -6,16 +6,8 @@ - - + Gentelella Alela! | -<<<<<<< HEAD -======= - - - Gentelella Alela! | - ->>>>>>> refs/remotes/puikinsh/Development