Merge pull request #433 from edudepetris/fix-merge-375

Remove conflicts on merge #375
8 years ago · 94cc8651b0
parent bdd8dddaae b0c222be17
commit 94cc8651b0
1 changed files with 3 additions and 11 deletions
--- a/production/form.html
+++ b/production/form.html
@ -7,15 +7,7 @@
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width, initial-scale=1">

-	
    <title>Gentelella Alela! | </title>
-<<<<<<< HEAD
-=======
-
-
-    <title>Gentelella Alela! | </title>
-
->>>>>>> refs/remotes/puikinsh/Development

    <!-- Bootstrap -->
    <link href="../vendors/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">