1
This commit is contained in:
parent
9c3a61daa4
commit
0303a7cecf
@ -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();
|
||||
|
Loading…
x
Reference in New Issue
Block a user