github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-02 14:03:58 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Oops.

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spec/services/staff_action_logger_spec.rb
View File

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