localhost_frssoft/bloat
1
0
Fork 0
mirror of https://gitea.phreedom.club/localhost_frssoft/bloat.git synced 2025-05-10 22:08:45 +00:00
Code Issues Projects Releases Wiki Activity

fix merge conflicts

Browse source
This commit is contained in:
localhost_frssoft 2023-10-12 16:07:27 +03:00
parent 4379eab5bf
commit 96a0d7cf05
3 changed files with 2 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

5
templates/status.tmpl
View file

@ -98,14 +98,9 @@
</div>
{{if (or .Content .SpoilerText)}}
<div class="status-content">
<<<<<<< HEAD
{{if .Sensitive}}[NSFW]<br/>{{end}}
{{if .SpoilerText}}[{{EmojiFilter (HTML .SpoilerText) .Emojis | Raw}}]<br/>{{end}}
{{StatusContentFilter .Content .Emojis .Mentions | Raw}}
=======
{{- if .SpoilerText}}{{EmojiFilter (HTML .SpoilerText) .Emojis | Raw}}<br/>{{end -}}
{{- StatusContentFilter .Content .Emojis .Mentions | Raw -}}
>>>>>>> upstream/master
</div>
{{end}}
{{$st_id := .ID}}