From 63196ea68e0eab82ac6654b0dd1be14b62a5c52d Mon Sep 17 00:00:00 2001 From: Matt Date: Fri, 22 Oct 2021 21:08:31 +0100 Subject: [PATCH] Fixed BookBuilder conflict --- .../dev/triumphteam/gui/builder/item/BookBuilder.java | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/core/src/main/java/dev/triumphteam/gui/builder/item/BookBuilder.java b/core/src/main/java/dev/triumphteam/gui/builder/item/BookBuilder.java index 6e395226..ea0b8c27 100644 --- a/core/src/main/java/dev/triumphteam/gui/builder/item/BookBuilder.java +++ b/core/src/main/java/dev/triumphteam/gui/builder/item/BookBuilder.java @@ -69,19 +69,8 @@ public BookBuilder author(@Nullable final Component author) { return this; } -<<<<<<< Updated upstream bookMeta.setAuthor(Legacy.SERIALIZER.serialize(author)); setMeta(bookMeta); -======= - if (VersionHelper.IS_COMPONENT_LEGACY) { - bookMeta.setAuthor(Legacy.SERIALIZER.serialize(author)); - setMeta(bookMeta); - } else { - bookMeta.setAuthor(Legacy.SERIALIZER.serialize(author)); - setMeta(bookMeta); - } - ->>>>>>> Stashed changes return this; }