From a7b0a0dd4b305eb8655b008ebcfdcd2f7b70079a Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Fri, 15 Oct 2021 02:43:07 +0800
Subject: Fix merge conflicts

---
 .../main/java/me/shedaniel/rei/impl/client/util/CrashReportUtils.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/util/CrashReportUtils.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/util/CrashReportUtils.java
index ac7cc3777..d3159a9ca 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/util/CrashReportUtils.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/util/CrashReportUtils.java
@@ -35,8 +35,8 @@ public class CrashReportUtils {
         Throwable temp = throwable;
         while (temp != null) {
             temp = temp.getCause();
-            if (temp instanceof ReportedException reportedException) {
-                return essential(reportedException, task);
+            if (temp instanceof ReportedException) {
+                return essential(temp, task);
             }
         }
         CrashReport report = CrashReport.forThrowable(throwable, task);
-- 
cgit