Fixed BookBuilder conflict

TriumphTeam · Oct 22, 2021 · 63196ea · 63196ea
1 parent 7f21c3c
commit 63196ea
Showing 1 changed file with 0 additions and 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
@@ -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;
  }