kristjank/TeraHz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Kristjan Komlosi
2020-07-13 13:56:30 +02:00
parent d6a0efd69b
commit 320bcae78e
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
terahz/templates/index.html
-4
View File
@@ -4,11 +4,7 @@
<head> <head>
<meta charset="utf8"> <meta charset="utf8">
<link rel="stylesheet" href="static/bootstrap.min.css"> <link rel="stylesheet" href="static/bootstrap.min.css">
<<<<<<< HEAD
<link rel="stylesheet" href="static/stylesheet.css"> <link rel="stylesheet" href="static/stylesheet.css">
=======
<link rel="stylesheet" href="stylesheet.css">
>>>>>>> 229719cc5c78474bce0ff1caf98075b97941a6df
<title>TeraHz</title> <title>TeraHz</title>
<!-- script imports --> <!-- script imports -->
<script src="static/bootstrap.bundle.min.js"></script> <script src="static/bootstrap.bundle.min.js"></script>