diff --git a/index.html b/index.html index ed7f6e3..349a481 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@
- <<<<<<< HEAD +site publiƩ sous licence libre CC-By-SA
- >>>>>>> 4ee4ea682ea20d9821300acfab37756f7574ed08 + diff --git a/index.html.bak b/index.html.bak index ed7f6e3..349a481 100644 --- a/index.html.bak +++ b/index.html.bak @@ -3,7 +3,7 @@ - <<<<<<< HEAD +site publiƩ sous licence libre CC-By-SA
- >>>>>>> 4ee4ea682ea20d9821300acfab37756f7574ed08 +