直しきれてないコンフリクトの解消

lib/tasks/tests.rake

@@ -78,11 +78,7 @@ namespace :tests do
            'https://remote.com/@remote', 'https://remote.com/salmon/1'),
           (4, 'Remote', 'remote.com', NULL, #{remote_public_key}, now(), now(),
            'https://remote.com/@Remote', 'https://remote.com/salmon/1'),
-<<<<<<< HEAD
-          (5, 'REMOTE', 'Remote.com', NULL, #{remote_public_key2}, now(), now(),
-=======
           (5, 'REMOTE', 'Remote.com', NULL, #{remote_public_key2}, now() - interval '1 year', now() - interval '1 year',
->>>>>>> v3.5.0rc1
            'https://remote.com/stale/@REMOTE', 'https://remote.com/stale/salmon/1');
 
         INSERT INTO "accounts"
@@ -97,8 +93,6 @@ namespace :tests do
           (7, 'user', #{local_domain}, #{user_private_key}, #{user_public_key}, now(), now()),
           (8, 'pt_user', NULL, #{user_private_key}, #{user_public_key}, now(), now());
 
-<<<<<<< HEAD
-=======
         INSERT INTO "accounts"
           (id, username, domain, private_key, public_key, created_at, updated_at, protocol, inbox_url, outbox_url, followers_url, suspended)
         VALUES
@@ -106,7 +100,6 @@ namespace :tests do
            1, 'https://activitypub.com/users/evil/inbox', 'https://activitypub.com/users/evil/outbox',
            'https://activitypub.com/users/evil/followers', true);
 
->>>>>>> v3.5.0rc1
         -- users
 
         INSERT INTO "users"
@@ -120,12 +113,9 @@ namespace :tests do
         VALUES
           (3, 7, 'ptuser@localhost', now(), now(), false, 'pt');
 
-<<<<<<< HEAD
-=======
         -- conversations
         INSERT INTO "conversations" (id, created_at, updated_at) VALUES (1, now(), now());
 
->>>>>>> v3.5.0rc1
         -- statuses
 
         INSERT INTO "statuses"
@@ -161,16 +151,6 @@ namespace :tests do
         VALUES
           (9, 1, 2, now(), now());
 
-<<<<<<< HEAD
-        -- mentions (from previous statuses)
-
-        INSERT INTO "mentions"
-          (status_id, account_id, created_at, updated_at)
-        VALUES
-          (2, 3, now(), now()),
-          (3, 4, now(), now()),
-          (4, 5, now(), now());
-=======
         INSERT INTO "statuses"
           (id, account_id, text, in_reply_to_id, conversation_id, visibility, created_at, updated_at)
         VALUES
@@ -187,7 +167,6 @@ namespace :tests do
           (3, 4, 5, now(), now()),
           (4, 10, 1, now(), now()),
           (5, 11, 2, now(), now());
->>>>>>> v3.5.0rc1
 
         -- stream entries
 
@@ -204,10 +183,6 @@ namespace :tests do
           (8, 5, 'status', now(), now()),
           (9, 1, 'status', now(), now());
 
-<<<<<<< HEAD
-
-=======
->>>>>>> v3.5.0rc1
         -- custom emoji
 
         INSERT INTO "custom_emojis"
@@ -247,21 +222,12 @@ namespace :tests do
         -- follows
 
         INSERT INTO "follows"
-<<<<<<< HEAD
-          (account_id, target_account_id, created_at, updated_at)
-        VALUES
-          (1, 5, now(), now()),
-          (6, 2, now(), now()),
-          (5, 2, now(), now()),
-          (6, 1, now(), now());
-=======
           (id, account_id, target_account_id, created_at, updated_at)
         VALUES
           (1, 1, 5, now(), now()),
           (2, 6, 2, now(), now()),
           (3, 5, 2, now(), now()),
           (4, 6, 1, now(), now());
->>>>>>> v3.5.0rc1
 
         -- follow requests
 
@@ -270,8 +236,6 @@ namespace :tests do
         VALUES
           (2, 5, now(), now()),
           (5, 1, now(), now());
-<<<<<<< HEAD
-=======
 
         -- notifications
 
@@ -281,7 +245,6 @@ namespace :tests do
           (1, 6, 2, 'Follow', 2, now(), now()),
           (2, 2, 1, 'Mention', 4, now(), now()),
           (3, 1, 2, 'Mention', 5, now(), now());
->>>>>>> v3.5.0rc1
       SQL
     end
   end

spec/controllers/follower_accounts_controller_spec.rb

@@ -103,11 +103,7 @@ describe FollowerAccountsController do
 
         context 'when account hides their network' do
           before do
-<<<<<<< HEAD
-            alice.user.settings.hide_network = true
-=======
             alice.update(hide_collections: true)
->>>>>>> v3.5.0rc1
           end
 
           it 'returns followers count' do

spec/controllers/following_accounts_controller_spec.rb

@@ -103,11 +103,7 @@ describe FollowingAccountsController do
 
         context 'when account hides their network' do
           before do
-<<<<<<< HEAD
-            alice.user.settings.hide_network = true
-=======
             alice.update(hide_collections: true)
->>>>>>> v3.5.0rc1
           end
 
           it 'returns followers count' do