jinql
/
gentelella
mirror of https://github.com/ColorlibHQ/gentelella
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #383 from krzysiekpiasecki/patch-2 

Remove merge marker
pull/384/head
Christian Esperar 2017-01-28 16:44:57 +08:00 committed by GitHub
parent 3448fdfdf1 cbefb2dda8
commit 33dabf2b10
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
production/form.html
View File

@ -7,15 +7,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<title>Gentelella Alela! | </title> <title>Gentelella Alela! | </title>
<<<<<<< HEAD
=======
<title>Gentelella Alela! | </title>
>>>>>>> refs/remotes/puikinsh/Development
<!-- Bootstrap --> <!-- Bootstrap -->
<link href="../vendors/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"> <link href="../vendors/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">