Fix: merge conflict

2023-12-29 22:53:04 +00:00
parent 19e2709b5f
commit efbeec2d1f
1 changed files with 0 additions and 5 deletions
--- a/module.json
+++ b/module.json
@@ -108,11 +108,6 @@
      "system": "dnd5e",
      "path": "packs/Subclass"
    }
-<<<<<<< HEAD
  ],
  "id": "SharedData_global"
 }
-=======
-  ]
-}
->>>>>>> 437464ddb1c200a3db307a78fbaf671763fc6015