From e231c013ea55102e83c35bf4162f91b269b0a473 Mon Sep 17 00:00:00 2001
From: Isma <ismaeldelatorre333@gmail.com>
Date: Tue, 30 Jan 2024 00:28:39 +0100
Subject: [PATCH] Update manifest

---
 manifest | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/manifest b/manifest
index 2d75786..4b2a9f3 100644
--- a/manifest
+++ b/manifest
@@ -2,7 +2,11 @@ const vars = {
     id: "mcjaen2024",
     icon: "https://git.ragestudio.net/srgooglo/jaen-united-2024/raw/branch/main/icon.gif",
     name: "Jaen United Server",
+<<<<<<< Updated upstream
     version: "1.3.3",
+=======
+    version: "1.3.4",
+>>>>>>> Stashed changes
     author: "Jaen United",
     description: "Jaen United Minecraft modpack",
 }