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

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

Browse source 
Remove conflicts on merge #375
This commit is contained in:
AndreiCN 2017-03-24 18:12:15 +02:00 committed by GitHub
parent bdd8dddaae b0c222be17
commit 94cc8651b0
1 changed files with 3 additions and 11 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 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">