From 23d4435af1fc070d2476dccf80e01c5898a1e90d Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Thu, 12 Jan 2017 09:56:20 +0800
Subject: [PATCH] Oops.

---
 spec/services/staff_action_logger_spec.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spec/services/staff_action_logger_spec.rb b/spec/services/staff_action_logger_spec.rb
index df2e4c6a9ca..62b30c9b48f 100644
--- a/spec/services/staff_action_logger_spec.rb
+++ b/spec/services/staff_action_logger_spec.rb
@@ -370,7 +370,6 @@ describe StaffActionLogger do
     end
   end
 
-<<<<<<< 240c4870cfa43dea222ed52d4ce57b6ac186588d
   describe 'log_lock_trust_level' do
     let(:user) { Fabricate(:user) }