From 0dd97db996b084fc8e0533e093e8116786308747 Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Sat, 20 Nov 2021 20:51:17 +0800
Subject: Fix merge conflicts

---
 api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Tooltip.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'api/src/main/java/me')

diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Tooltip.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Tooltip.java
index d44731cc9..5f459dac9 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Tooltip.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Tooltip.java
@@ -23,7 +23,7 @@
 
 package me.shedaniel.rei.api.client.gui.widgets;
 
-import me.shedaniel.architectury.utils.Env;
+import dev.architectury.utils.Env;
 import dev.architectury.utils.EnvExecutor;
 import me.shedaniel.math.Point;
 import me.shedaniel.rei.api.client.REIRuntime;
-- 
cgit