From 5c9f7fd04e83326069fe3d9ae499471434fdd09d Mon Sep 17 00:00:00 2001 From: nelo Date: Wed, 5 Oct 2016 15:22:10 +0200 Subject: [PATCH] merge bien hecho --- index.html | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/index.html b/index.html index ca2e14b018..5f37df36e6 100644 --- a/index.html +++ b/index.html @@ -10,20 +10,17 @@
{{1+1}} -<<<<<<< HEAD
- index - add - edit - delete -======= -
-
-
-
- ->>>>>>> f1a3e2dd5837c6b7a66486b5566e422ca10a8399 -
+ index + add + edit + delete +
+
+
+
+ +