From 278d925c19ef45c6691f66167875a8497833dfdb Mon Sep 17 00:00:00 2001
From: Krakinou <misterl56@hotmail.com>
Date: Sun, 7 May 2023 15:31:49 +0200
Subject: [PATCH] remove git info

---
 manifest.toml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 9036f89..d33b272 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -5,11 +5,7 @@ name = "Zwave-JS-UI"
 description.en = "Full featured Z-Wave Control Panel and MQTT Gateway integrated with domoticz"
 description.fr = "Panneau de controle Z-Wave et MQTT intégré avec Domoticz"
 
-<<<<<<< HEAD
 version = "8.15.0~ynh2"
-=======
-version = "8.15.0~ynh1"
->>>>>>> refs/remotes/origin/testing
 
 maintainers = ["Krakinou"]