From 0303a7cecf9e9a21ece13e55a43e7dc14285bb53 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 2 Jun 2022 17:32:51 +0800
Subject: [PATCH] 1

---
 webapp/controller/TempToolsController.class.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/webapp/controller/TempToolsController.class.php b/webapp/controller/TempToolsController.class.php
index 7ddc3b76..832acbf0 100644
--- a/webapp/controller/TempToolsController.class.php
+++ b/webapp/controller/TempToolsController.class.php
@@ -66,7 +66,6 @@ class TempToolsController extends BaseController {
         ));
     }
 
-<<<<<<< HEAD
     public function exportRankActivity()
     {
         $type = getReqVal('type', '');
@@ -114,8 +113,6 @@ class TempToolsController extends BaseController {
         }
     }
 
-=======
->>>>>>> master
     public function getRiskAccounts()
     {
         $accounts = array();