Commit f64aa8c8 authored by Ash McKenzie's avatar Ash McKenzie

Resolve conflicts in spec/models/remote_mirror_spec.rb

parent 068a418d
......@@ -164,7 +164,6 @@ describe RemoteMirror do
end
end
<<<<<<< HEAD
context 'as a Geo secondary' do
it 'returns nil' do
allow(Gitlab::Geo).to receive(:secondary?).and_return(true)
......@@ -173,8 +172,6 @@ describe RemoteMirror do
end
end
=======
>>>>>>> upstream/master
context 'with remote mirroring enabled' do
context 'with only protected branches enabled' do
context 'when it did not update in the last minute' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment