server/game2006api
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2022-06-02 17:32:51 +08:00
parent 9c3a61daa4
commit 0303a7cecf
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
webapp/controller/TempToolsController.class.php
View File

@ -66,7 +66,6 @@ class TempToolsController extends BaseController {
)); ));
} }
<<<<<<< HEAD
public function exportRankActivity() public function exportRankActivity()
{ {
$type = getReqVal('type', ''); $type = getReqVal('type', '');
@ -114,8 +113,6 @@ class TempToolsController extends BaseController {
} }
} }
=======
>>>>>>> master
public function getRiskAccounts() public function getRiskAccounts()
{ {
$accounts = array(); $accounts = array();