From 59d6fbb9115dc6c04e4b63429b7ce23651ba95ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christer=20War=C3=A9n?= <cwchristerw@gmail.com>
Date: Thu, 8 Feb 2024 17:39:40 +0200
Subject: [PATCH] Update README.md

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index 39ea59e3..f4fcb002 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,3 @@
-<<<<<<< HEAD
-# Musix OSS
-=======
 # Musix-V2
 
 THIS VERSION OF MUSIX IS NO LONGER SUPPORTED!
@@ -22,4 +19,3 @@ Some modules are outdated to updating is recommended!
 ## Usage
 
 You will need you own .env file and serviceAccount.json for database!
->>>>>>> musix-v2/master