diff options
author | IRONM00N <64110067+IRONM00N@users.noreply.github.com> | 2020-11-13 18:41:01 -0500 |
---|---|---|
committer | IRONM00N <64110067+IRONM00N@users.noreply.github.com> | 2020-11-13 18:41:01 -0500 |
commit | b6fd4b6bfe35a3268fd03b267bf626026920b8d7 (patch) | |
tree | 05e6091e4385fba6926bd24d90974c068a4d3979 /items/DUNGEON_TRAP.json | |
parent | abe9292c1f44cca735dd92474558a23348de203c (diff) | |
download | NotEnoughUpdates-REPO-b6fd4b6bfe35a3268fd03b267bf626026920b8d7.tar.gz NotEnoughUpdates-REPO-b6fd4b6bfe35a3268fd03b267bf626026920b8d7.tar.bz2 NotEnoughUpdates-REPO-b6fd4b6bfe35a3268fd03b267bf626026920b8d7.zip |
Manual Merge bc Conflicts
Diffstat (limited to 'items/DUNGEON_TRAP.json')
-rw-r--r-- | items/DUNGEON_TRAP.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/items/DUNGEON_TRAP.json b/items/DUNGEON_TRAP.json index c5a538ed..e21b186f 100644 --- a/items/DUNGEON_TRAP.json +++ b/items/DUNGEON_TRAP.json @@ -23,4 +23,4 @@ "info": [ "https://hypixel-skyblock.fandom.com/wiki/Trap" ] -}
\ No newline at end of file +} |