lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: rebase fixes

Browse source
This commit is contained in:
Liordino dos Santos Rocha Neto 2020-04-26 17:43:00 -03:00 • committed by Josh Harvey
parent 90177aab55
commit 7885d56211
4 changed files with 31 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

6
new-lamassu-admin/src/routing/routes.js
View file

@ -13,10 +13,9 @@ import OperatorInfo from 'src/pages/OperatorInfo/OperatorInfo'
import ServerLogs from 'src/pages/ServerLogs'
import Services from 'src/pages/Services/Services'
import Transactions from 'src/pages/Transactions/Transactions'
import Triggers from 'src/pages/Triggers'
import WalletSettings from 'src/pages/Wallet/Wallet'
import MachineStatus from 'src/pages/maintenance/MachineStatus'
import Customers from 'src/pages/Customers'
import Triggers from 'src/pages/Triggers'
import { namespaces } from 'src/utils/config'
const tree = [
@ -117,7 +116,8 @@ const tree = [
{
key: 'triggers',
label: 'Triggers',
route: '/compliance/triggers'
route: '/compliance/triggers',
component: Triggers
},
{
key: 'customers',