Fix conflicts related to Timecop safe methods

Signed-off-by: Rémy Coutable <remy@rymai.me>

spec/features/boards/sidebar_spec.rb

@@ -15,17 +15,12 @@ describe 'Issue Boards', js: true do
   let!(:list)        { create(:list, board: board, label: development, position: 0) }
   let(:card) { find('.board:nth-child(2)').first('.card') }
 
-<<<<<<< HEAD
-  before do
-    Timecop.freeze
-    stub_licensed_features(multiple_issue_assignees: false)
-=======
   around do |example|
     Timecop.freeze { example.run }
   end
->>>>>>> ce-com/master
 
   before do
+    stub_licensed_features(multiple_issue_assignees: false)
     project.add_master(user)
 
     sign_in(user)

spec/lib/gitlab/git/storage/circuit_breaker_spec.rb

@@ -175,15 +175,7 @@ describe Gitlab::Git::Storage::CircuitBreaker, clean_gitlab_redis_shared_state:
 
   describe '#track_storage_inaccessible' do
     around do |example|
-<<<<<<< HEAD
-      Timecop.freeze
-
-      example.run
-
-      Timecop.return
-=======
       Timecop.freeze { example.run }
->>>>>>> ce-com/master
     end
 
     it 'records the failure time in redis' do