From 60974d61c8610563871185f4a41f55dfe771a1bb Mon Sep 17 00:00:00 2001
From: saru <sarushinobie@proton.me>
Date: Sun, 27 Oct 2024 14:56:19 -0500
Subject: [PATCH] resync

---
 installer-windows.bat | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/installer-windows.bat b/installer-windows.bat
index c19678c..0c12bed 100644
--- a/installer-windows.bat
+++ b/installer-windows.bat
@@ -36,7 +36,6 @@ echo Updating...
         @timeout /t 2 >nul 2>&1
     
     tar -xvzf %mcroot%/mods.tar.gz -C %modfolder%
-<<<<<<< HEAD
 
 :::      :+++++=
 :::      -++++++.
@@ -73,8 +72,6 @@ echo Updating...
 :::                                           ....
 
 for /f "delims=: tokens=*" %%A in ('findstr /b ::: "%~f0"') do @echo(%%A)
-=======
->>>>>>> 2245d8798bc0de4d39bdc21bcede5eeb654c4f51
 echo Sigma!
 echo All done. C:
 echo This window will close in ten seconds.