diff --git a/README.md b/README.md index eaf6314..f5addcf 100644 --- a/README.md +++ b/README.md @@ -18,11 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Synapse-admin is an Admin UI for Matrix Synapse homeserver. -<<<<<<< HEAD -**Shipped version:** 0.8.7~ynh2 -======= **Shipped version:** 0.8.7~ynh1 ->>>>>>> parent of ec2cc1d (Merge branch 'testing' into version-2) ## Screenshots diff --git a/README_fr.md b/README_fr.md index 8255298..0ef8818 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,11 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Synapse-admin is an Admin UI for Matrix Synapse homeserver. -<<<<<<< HEAD -**Version incluse :** 0.8.7~ynh2 -======= **Version incluse :** 0.8.7~ynh1 ->>>>>>> parent of ec2cc1d (Merge branch 'testing' into version-2) ## Captures d’écran