about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authormultiple creatures <dev@multiple-creature.party>2020-01-20 23:10:12 -0600
committermultiple creatures <dev@multiple-creature.party>2020-01-20 23:10:12 -0600
commit5c796f8cf64e70efe29db055be9cfe6ef9a8291c (patch)
tree49f1689b0fe58f239c5b9e8a7e75bebac2e95387 /app
parentedf5be3cfe767509e74e9ad46c64659c35ad129a (diff)
resolve stray merge conflict between tfonline/monsterfork strings
Diffstat (limited to 'app')
-rw-r--r--app/javascript/mastodon/locales/en.json4
1 files changed, 0 insertions, 4 deletions
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 8a20cf206..1848c6c62 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -326,12 +326,8 @@
   "search_popout.tips.user": "creature",
   "search_results.accounts": "Monsters",
   "search_results.hashtags": "Hashtags",
-<<<<<<< HEAD
   "search_results.statuses": "Roars",
-=======
-  "search_results.statuses": "TF spells",
   "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
->>>>>>> af0c4b345... Make a shoddy attempt to merge pull request #1158 from ThibG/glitch-soc/merge-upstream
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
   "status.admin_account": "Moderate @{name}",
   "status.admin_status": "Moderate roar",