master
Tait Hoyem 2 years ago
parent 7bac3778d0
commit 0b2b8f599e

@ -3,7 +3,6 @@
<head>
<meta charset="UTF-8">
<title>{{ page.title }} | tait.tech</title>
<<<<<<< HEAD
<link rel="stylesheet" href="/assets/css/style.css" id="main-stylesheet">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
{%- if page.math -%}
@ -14,18 +13,6 @@
<link rel="stylesheet" href="/assets/css/highlight.css" id="code-stylesheet">
{% endif %}
{% contentblock extrahead %}
=======
<link rel="stylesheet" href="/assets/css/style.css" id="main-css">
<link rel="stylesheet" href="/assets/css/transcription.css" id="trans-css">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<script src="/assets/js/"></script>
{% if page.math %}
<link rel="stylesheet" href="/assets/css/katex.css" id="math-css">
{% endif %}
{% if page.code %}
<link rel="stylesheet" href="/assets/css/highlighting.css" id="code-css">
{% endif %}
>>>>>>> ca770be68ffdcb836bbddb3a47786c64f4f717a7
</head>
<body>
<main>

Loading…
Cancel
Save