Fix: merge conflict
This commit is contained in:
1 parent
19e2709b5f
commit
efbeec2d1f
1 file changed
-5
@@ -108,11 +108,6 @@
|
||||
"system": "dnd5e",
|
||||
"path": "packs/Subclass"
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
],
|
||||
"id": "SharedData_global"
|
||||
}
|
||||
=======
|
||||
]
|
||||
}
|
||||
>>>>>>> 437464ddb1c200a3db307a78fbaf671763fc6015
|
||||
Reference in new issue
Block a user