Removed the unintended icons that came from merge conflicts

This commit is contained in:
WBHarry 2025-08-11 17:25:55 +02:00
parent d224827d2a
commit 06722f63d2

View file

@ -51,18 +51,6 @@
{{/if}} {{/if}}
<div class="encounter-controls {{#if hasCombat}}combat{{/if}}"> <div class="encounter-controls {{#if hasCombat}}combat{{/if}}">
{{#if hasCombat}}
<div class="encounter-fear-controls">
<div class="encounter-fear-dice-container">
<div class="encounter-control-fear-container">
<div class="dice d12"></div>
<i class="fas fa-skull encounter-control-fear"></i>
</div>
<div>{{fear}}</div>
</div>
<a class="encounter-countdowns" data-tooltip="{{localize "DAGGERHEART.APPLICATIONS.Countdown.title" type=(localize "DAGGERHEART.APPLICATIONS.Countdown.types.encounter")}}" data-action="openCountdowns"><i class="fa-solid fa-stopwatch"></i></a>
</div>
{{/if}}
{{!-- Combat Status --}} {{!-- Combat Status --}}
<strong class="encounter-title"> <strong class="encounter-title">
{{#if combats.length}} {{#if combats.length}}