Merge branch 'development' of github.com:cls-02/TeraHz into development

2020-07-13 13:55:44 +02:00
parent 40a79af9af 229719cc5c
commit d6a0efd69b
1 changed files with 4 additions and 0 deletions
--- a/terahz/templates/index.html
+++ b/terahz/templates/index.html
@@ -4,7 +4,11 @@
 <head>
  <meta charset="utf8">
  <link rel="stylesheet" href="static/bootstrap.min.css">
+<<<<<<< HEAD
  <link rel="stylesheet" href="static/stylesheet.css">
+=======
+  <link rel="stylesheet" href="stylesheet.css">
+>>>>>>> 229719cc5c78474bce0ff1caf98075b97941a6df
  <title>TeraHz</title>
  <!-- script imports -->
  <script src="static/bootstrap.bundle.min.js"></script>