From be6496177793a0f65758ba3e7c208c9f0e0da7ea Mon Sep 17 00:00:00 2001
From: penguinehis <ponei@anasor.com>
Date: Mon, 1 Dec 2025 00:33:20 -0300
Subject: [PATCH] Fix version

---
 version.txt | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/version.txt b/version.txt
index aae3e30..26e4390 100644
--- a/version.txt
+++ b/version.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-38 Year Of the Noodle Dragon
-=======
-37 Year Of the Noodle Dragon
->>>>>>> c8562cc676ebda86e0357d4888d9d576421d53e3
+38 Year Of the Noodle Dragon
\ No newline at end of file