resolve merge

2017-07-23 14:31:13 +02:00
parent dcf5719eaf 5c07eac4de
commit 2e3be27278
2 changed files with 4 additions and 5 deletions
--- a/www/todo/index.html
+++ b/www/todo/index.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <!DOCTYPE html>
 <html class="cp pad">
 <head>