From 34e618965cdc3ca6c5320cca3c4b7a0b56f30b5c Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Tue, 7 Jun 2022 13:43:05 -0700
Subject: [PATCH] fix unmerged diff

---
 ...e-TerminalConsoleAppender-for-console-improvements.patch | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/patches/server/Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/Use-TerminalConsoleAppender-for-console-improvements.patch
index e1b8687e35..1f640a0240 100644
--- a/patches/server/Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/patches/server/Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -116,15 +116,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -0,0 +0,0 @@ import org.slf4j.Logger;
- // CraftBukkit start
  import com.mojang.serialization.DynamicOps;
  import com.mojang.serialization.Lifecycle;
-+<<<<<<< HEAD
  import java.util.Random;
- import jline.console.ConsoleReader;
-+=======
+-import jline.console.ConsoleReader;
 +// import jline.console.ConsoleReader; // Paper
-+>>>>>>> Use TerminalConsoleAppender for console improvements
  import joptsimple.OptionSet;
  import net.minecraft.server.bossevents.CustomBossEvents;
  import net.minecraft.server.dedicated.DedicatedServer;