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

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

Remove conflicts on merge #375
pull/577/head
AndreiCN 8 years ago committed by GitHub
parent
bdd8dddaae b0c222be17
commit
94cc8651b0
1 changed files with 3 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      production/form.html

8
production/form.html
Unescape 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">

Write Preview
Loading…
Cancel
Save