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

Remove conflicts on merge #375
2017-03-24 18:12:15 +02:00 · 2017-03-21 22:40:45 -03:00 · 2017-01-24 13:12:29 +01:00
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">
Author	SHA1	Message	Date
AndreiCN	94cc8651b0	Merge pull request #433 from edudepetris/fix-merge-375 Remove conflicts on merge #375	2017-03-24 18:12:15 +02:00
Edu Depetris	b0c222be17	Remove conflicts on merge #375	2017-03-21 22:40:45 -03:00
Aigars Silkalns	bdd8dddaae	Merge pull request #299 from puikinsh/master Major update	2017-01-24 13:12:29 +01:00