From 320bcae78e6334497c67441430a1762fdbd38e94 Mon Sep 17 00:00:00 2001 From: Kristjan Komlosi Date: Mon, 13 Jul 2020 13:56:30 +0200 Subject: [PATCH] Merge branch 'development' of github.com:cls-02/TeraHz into developmen --- terahz/templates/index.html | 4 ---- 1 file changed, 4 deletions(-) diff --git a/terahz/templates/index.html b/terahz/templates/index.html index 827277f..b2f9adb 100644 --- a/terahz/templates/index.html +++ b/terahz/templates/index.html @@ -4,11 +4,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> 229719cc5c78474bce0ff1caf98075b97941a6df TeraHz