mirror of
https://github.com/Foundryborne/daggerheart.git
synced 2026-01-18 07:59:03 +01:00
Fix conflicts
This commit is contained in:
commit
92a0883806
121 changed files with 1526 additions and 1107 deletions
|
|
@ -31,7 +31,7 @@
|
|||
<div class="target-data">
|
||||
<div class="target-name" data-perm-id="{{actorId}}"><span>{{name}}</span></div>
|
||||
{{#if (and ../hasRoll (hasProperty this "hit"))}}
|
||||
<div class="target-hit-status {{#if hit}}is-hit{{else}}is-miss{{/if}}">
|
||||
<div class="target-hit-status {{#if hit}}is-hit{{else}}is-miss{{/if}}" data-perm-id="{{actorId}}" data-perm-hidden="true">
|
||||
{{#if hit}}
|
||||
{{localize "DAGGERHEART.GENERAL.hit.single"}}
|
||||
{{else}}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue