Fix conflicts

This commit is contained in:
Dapoolp 2025-08-25 13:42:23 +02:00
commit 92a0883806
121 changed files with 1526 additions and 1107 deletions

View file

@ -25,7 +25,7 @@
</div>
{{/each}}
</div>
<div class="adversaries-dragger">
<div class="drag-area">
<span>{{localize "DAGGERHEART.GENERAL.dropActorsHere"}}</span>
</div>
</fieldset>