this is cleanup

ModMaker101 · Mar 20, 2024 · 527d8bd · 527d8bd
1 parent 27c78e9
commit 527d8bd
Show file tree

Hide file tree

Showing 34 changed files with 0 additions and 2,755 deletions.
diff --git a/nBehavior/blocks/hokage.block.json b/nBehavior/blocks/hokage.block.json
diff --git a/nBehavior/entities/jutsu/fire_ball_jutsu.json b/nBehavior/entities/jutsu/fire_ball_jutsu.json
@@ -1,9 +1,5 @@
 {
-<<<<<<< Updated upstream:nBehavior/entities/jutsu/fire_ball_jutsu.json
-  "format_version": "1.20.30",
-=======
   "format_version": "1.20.0",
->>>>>>> Stashed changes:n Behavior/entities/jutsu/fire_ball_jutsu.json
   "minecraft:entity": {
     "description": {
       "identifier": "naruto:fire_ball_jutsu",

diff --git a/nBehavior/entities/jutsu/teleport_kunai.json b/nBehavior/entities/jutsu/teleport_kunai.json