Browse Source

Merge pull request #383 from krzysiekpiasecki/patch-2

Remove merge marker
Christian Esperar 8 years ago
parent
commit
33dabf2b10
1 changed files with 1 additions and 9 deletions
  1. 1 9
      production/form.html

+ 1 - 9
production/form.html

@@ -6,17 +6,9 @@
     <meta charset="utf-8">
     <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">
     <!-- Font Awesome -->