cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-01-18 07:59:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix conflict

Browse source
This commit is contained in:
Dapoolp 2025-08-01 20:41:20 +02:00
parent c3e7a3ea1a
commit 9b3632be2f
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lang/en.json
View file

@ -2302,11 +2302,8 @@
"dragApplyEffect": "Drag effect to apply it to an actor", "dragApplyEffect": "Drag effect to apply it to an actor",
"appliedEvenIfSuccessful": "Applied even if save succeeded", "appliedEvenIfSuccessful": "Applied even if save succeeded",
"diceIsRerolled": "The dice has been rerolled (x{times})", "diceIsRerolled": "The dice has been rerolled (x{times})",
<<<<<<< HEAD "pendingSaves": "Pending Reaction Rolls",
"pendingSaves": "Pending Reaction Rolls"
=======
"openSheetSettings": "Open Settings" "openSheetSettings": "Open Settings"
>>>>>>> main
} }
} }
} }

1
styles/less/global/chat.less
View file

@ -44,6 +44,7 @@
align-items: center; align-items: center;
gap: 8px; gap: 8px;
flex: 1; flex: 1;
overflow: hidden;
.actor-img { .actor-img {
border-radius: 50%; border-radius: 50%;