From c600f16baf66fac26ba40c0d3d4df46a822ede89 Mon Sep 17 00:00:00 2001
From: multiple creatures <dev@multiple-creature.party>
Date: Fri, 21 Feb 2020 00:07:34 -0600
Subject: resolve stray merge conflict

---
 app/controllers/accounts_controller.rb | 3 ---
 1 file changed, 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
-- 
cgit