From 97517c6ee5083b08c0865bc4623df4dccdb84803 Mon Sep 17 00:00:00 2001
From: Andre Merzky <andre@merzky.net>
Date: Wed, 17 Jan 2024 18:30:30 +0100
Subject: [PATCH] resolve;

---
 VERSION | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/VERSION b/VERSION
index 8ad50348f..21998d3c2 100644
--- a/VERSION
+++ b/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
 1.47.0
-=======
-1.46.1
->>>>>>> master