From f91d62e69f25b7bfb243d5892c5efd79c6c6555c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rn=20=C3=85ne?= Date: Wed, 17 Aug 2016 23:58:54 +0200 Subject: [PATCH] Remove merge cruft. --- www/index.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/www/index.php b/www/index.php index b13b87d..cdfdcc4 100644 --- a/www/index.php +++ b/www/index.php @@ -1,9 +1,4 @@ -<<<<<<< e4e8b0972bbec3fff581f7a97b34315265104f3a -======= - - ->>>>>>> Add automatic agenda on front page. Programvareverkstedet