From 92b71b8d87c443aef020a2c962f2e02c783de528 Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Tue, 17 Jul 2018 08:52:07 +1000 Subject: [PATCH] Fixed? --- templates/index.html | 45 +++++--------------------------------------- 1 file changed, 5 insertions(+), 40 deletions(-) diff --git a/templates/index.html b/templates/index.html index 97187db..f681f1d 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,11 +1,10 @@ - - - - - + + + + + -<<<<<<< HEAD @@ -38,39 +37,5 @@ -======= - - - - - - -
-
-

WhoIWatch

-
-
- -
-
- {% for x in livestreamdata %} -
- Card image cap -
-
{{ x["channel"]["display_name"] }}
-

{{ x["channel"]["game"] }}

-

{{ x["viewers"] }} Viewers

-
-
- {% endfor %} -
-
- - - - - - ->>>>>>> 1501a4a0ddf737b23850267c6f3a84354a3a6d75