diff options
| author | multiple creatures <dev@multiple-creature.party> | 2020-02-21 00:07:34 -0600 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2020-02-21 00:07:34 -0600 |
| commit | c600f16baf66fac26ba40c0d3d4df46a822ede89 (patch) | |
| tree | 5a7711c51ab5bfdd0c575bbe1a4e08e53629020b /app | |
| parent | 7d5c8ef95279cdc4b8c9a4f2f0f9a25584810edb (diff) | |
resolve stray merge conflict
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/accounts_controller.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index 7197c16b1..f8b0066a4 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -47,7 +47,6 @@ class AccountsController < ApplicationController format.rss do expires_in 1.minute, public: true -<<<<<<< HEAD if current_account&.user&.allows_rss? @statuses = filtered_statuses.without_reblogs.without_replies.limit(PAGE_SIZE) @@ -55,8 +54,6 @@ class AccountsController < ApplicationController else @statuses = [] end -======= ->>>>>>> 699f53c46... Fix RSS caching (but disable localization) (#12054) render xml: RSS::AccountSerializer.render(@account, @statuses, params[:tag]) end |