From 51e45b155cf0d179ac1f857111b10a3a68b931f7 Mon Sep 17 00:00:00 2001
From: Google61 <golubev634@gmail.com>
Date: Mon, 19 Apr 2021 09:51:54 +0300
Subject: [PATCH] Fix version file

---
 app_pojavlauncher/src/main/assets/components/jre/version | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app_pojavlauncher/src/main/assets/components/jre/version b/app_pojavlauncher/src/main/assets/components/jre/version
index 016ec029a..e5e2f23c9 100644
--- a/app_pojavlauncher/src/main/assets/components/jre/version
+++ b/app_pojavlauncher/src/main/assets/components/jre/version
@@ -1,5 +1 @@
-<<<<<<< HEAD
-20210418
-=======
-20210321
->>>>>>> parent of ce44eb37 (Remove prebuilt jre)
+20210322