This commit is contained in:
Guo Xiang Tan 2017-01-12 09:56:20 +08:00
parent 79c80f9974
commit 23d4435af1
1 changed files with 0 additions and 1 deletions

View File

@ -370,7 +370,6 @@ describe StaffActionLogger do
end
end
<<<<<<< 240c4870cfa43dea222ed52d4ce57b6ac186588d
describe 'log_lock_trust_level' do
let(:user) { Fabricate(:user) }