25 lines
532 B
HTML
25 lines
532 B
HTML
<!DOCTYPE html>
|
|
<html lang="en" charset="utf-8">
|
|
<<<<<<< HEAD
|
|
{% include "partials/head.html" %}
|
|
|
|
<body>
|
|
|
|
<div id="content">
|
|
{% block content %}{% endblock %}
|
|
</div>
|
|
|
|
</body>
|
|
=======
|
|
|
|
{% include "partials/head.html" %}
|
|
|
|
<body>
|
|
{% include "partials/header.html" %}
|
|
<div id="content" class="mx-8 md:mx-12 lg:mx-16 xl:mx-20 pt-24">
|
|
{% block content %}{% endblock %}
|
|
</div>
|
|
{% include "partials/footer.html" %}
|
|
</body>
|
|
>>>>>>> template/master
|
|
</html> |