maxmustermann/gentelella
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove merge marker

Browse source
This commit is contained in:
Krzysztof Piasecki 2017-01-28 09:36:05 +01:00 committed by GitHub
parent 3448fdfdf1
commit cbefb2dda8
1 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
production/form.html
View file

@ -6,16 +6,8 @@
<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">