From 4b53e02f6c1365a1fcd25ed47050b42952755204 Mon Sep 17 00:00:00 2001 From: ansuz Date: Sun, 23 Jul 2017 14:32:13 +0200 Subject: [PATCH] oups --- www/todo/index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/www/todo/index.html b/www/todo/index.html index 7c6df60a1..a76879a6d 100644 --- a/www/todo/index.html +++ b/www/todo/index.html @@ -1,4 +1,3 @@ -<<<<<<< HEAD