From ce4b41eb1c9d4404573365f8e8f1944801c1c1e6 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 10 Apr 2023 17:22:13 +0000 Subject: [PATCH] Auto-update README --- README.md | 4 ---- README_fr.md | 4 ---- 2 files changed, 8 deletions(-) diff --git a/README.md b/README.md index 294fc4b..9ca1f2e 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~ynh1 -======= **Shipped version:** 0.8.7~ynh2 ->>>>>>> testing ## Screenshots diff --git a/README_fr.md b/README_fr.md index 438b4ea..6f39ecc 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~ynh1 -======= **Version incluse :** 0.8.7~ynh2 ->>>>>>> testing ## Captures d’écran