From bfa53ca5b4cb9a0ef31256746612cb6289b06a49 Mon Sep 17 00:00:00 2001
From: Lorenz <lo.scherf@gmail.com>
Date: Sat, 6 Aug 2022 11:46:08 +0200
Subject: Merge branch 'master' of C:\Users\Lorenz\IdeaProjects\SkyHanni with
 conflicts.

---
 src/main/java/at/hannibal2/skyhanni/misc/CurrentPetDisplay.kt | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/main/java/at/hannibal2/skyhanni/misc')

diff --git a/src/main/java/at/hannibal2/skyhanni/misc/CurrentPetDisplay.kt b/src/main/java/at/hannibal2/skyhanni/misc/CurrentPetDisplay.kt
index 06284c7c9..9266dd4f5 100644
--- a/src/main/java/at/hannibal2/skyhanni/misc/CurrentPetDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/misc/CurrentPetDisplay.kt
@@ -36,7 +36,6 @@ class CurrentPetDisplay {
         }
     }
 
-
     @SubscribeEvent
     fun renderOverlay(event: RenderGameOverlayEvent.Post) {
         if (!LorenzUtils.inSkyblock) return
-- 
cgit