提交 33dabf2b 编写于 作者: C Christian Esperar 提交者: GitHub

Merge pull request #383 from krzysiekpiasecki/patch-2

Remove merge marker
......@@ -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 -->
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册