fix rebase errors

This commit is contained in:
Dario Rekowski on RockPI 2021-03-16 15:39:53 +00:00 committed by Ulf Gebhardt
parent af4ae0feab
commit cfddb27b48
No known key found for this signature in database
GPG Key ID: 81308EFE29ABFEBD

View File

@ -587,15 +587,7 @@ class StateBalancesController extends AppController
]);
}
public function ajaxListTransactions($page = 0, $count = 20)
{
return $this->returnJson([
'state' => 'error',
'msg' => 'moved',
'details' => 'moved to state-user-transactions/ajaxListTransactions/'
]);
}
public function ajaxGdtOverview()
{
@ -630,10 +622,6 @@ class StateBalancesController extends AppController
]);
}
public function ajaxGdtOverview()
{
return $this->returnJson(['state' => 'success', 'gdt' => ['sum' => 0, 'count' => 0]]);
}
public function overviewGdt()
{