oups

7 years ago · 4b53e02f6c
parent 2e3be27278
commit 4b53e02f6c
1 changed files with 0 additions and 1 deletions
--- a/www/todo/index.html
+++ b/www/todo/index.html
@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <!DOCTYPE html>
 <html class="cp pad">
 <head>