From 4fa5469cfba276999cdc4596aaa8b4cd4f9369c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ales=CC=8C=20Fabia=CC=81nek?= <fabianek.ales@gmail.com>
Date: Sun, 22 Jan 2023 10:40:36 +0100
Subject: [PATCH] Corrected versions

---
 gradle.properties | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 2d35d2f50..2771ccea9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,10 +8,7 @@ org.gradle.configureondemand=false
 # Mod
 mod_name=Friends&Foes
 mod_id=friendsandfoes
-<<<<<<< HEAD
 mod_version=1.7.5
-=======
-mod_version=1.6.8
 >>>>>>> 1.19.2
 mod_author=Faboslav
 mod_description=Adds outvoted and forgotten mobs from the mob votes in a believable vanilla plus style.