From 07a56f07d18d723aeedc3b5b30d9e623d4ed027b Mon Sep 17 00:00:00 2001
From: FTTT <87281759+zFTTT@users.noreply.github.com>
Date: Mon, 22 Nov 2021 17:04:43 -0800
Subject: [PATCH] Fix merge
Remove some bugs introduced in plugin.yml preventing plugin load
Updated a dependency to allow compiling
---
pom.xml | 2 +-
src/main/resources/plugin.yml | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index fd35b8fe6c5..e7f0ad7da20 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,7 +97,7 @@
9.0
1.18.16
- 4.7.0-SNAPSHOT
+ 4.7.0
[1.17,]
4.13.1
[1.16,]
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 41ec7705f1e..26d63a3fa54 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -57,8 +57,6 @@ commands:
aliases: [dmodify, dmod, disgmodify, modifydisguise, moddisguise, mdisguise]
permission: libsdisguises.seecmd.disguisemodify
description: Modify your own disguise
-<<<<<<< HEAD
-=======
disguisemodifyplayer:
aliases: [dmodifyplayer, dmodplayer, disgmodifyplayer, dismodplayer, disgmodplayer, modifydisguiseplayer,
moddisguiseplayer, mdisguiseplayer, mdisgplayer, dmodifyuuid, dmoduuid, disgmodifyuuid, dismoduuid, disgmoduuid, modifydisguiseuuid,
@@ -70,7 +68,6 @@ commands:
moddisguiseradius, mdisguiseradius, moddisgradius]
permission: libsdisguises.seecmd.disguisemodifyradius
description: Modify disguises in a radius
->>>>>>> 8ca5fd862a0ede80ec7732d3746322bd4176f8ea
disguisemodifyentity:
aliases: [dmodifyentity, dmodentity, disgmodentity, dismodentity, modifydisguiseentity, modifydisgentity,
modifydentity, moddisguiseentity, moddisgentity, mdisguiseentity, mdisgentity]