fix Merge conflict.

This commit is contained in:
Ahmed Bouhuolia
2020-03-26 14:02:52 +02:00
parent ae29d20cc9
commit 6fd1afaba7
25 changed files with 923 additions and 454 deletions

View File

@@ -1,18 +1,16 @@
export default [
{
divider: true,
divider: true
},
{
icon: 'homepage',
iconSize: 20,
text: 'Homepage',
disabled: false,
href: '/dashboard/homepage',
href: '/dashboard/homepage'
},
{
divider: true,
divider: true
},
{
icon: 'homepage',
@@ -36,7 +34,6 @@ export default [
icon: 'balance-scale',
iconSize: 20,
text: 'Financial',
href: '/dashboard/accounts',
children: [
{
text: 'Accounts Chart',
@@ -52,7 +49,6 @@ export default [
icon: 'university',
iconSize: 20,
text: 'Banking',
href: '/dashboard/accounts',
children: [
]
@@ -61,7 +57,6 @@ export default [
icon: 'shopping-cart',
iconSize: 20,
text: 'Sales',
href: '/dashboard/accounts',
children: [
]
@@ -70,13 +65,12 @@ export default [
icon: 'balance-scale',
iconSize: 20,
text: 'Purchases',
href: '/dashboard/accounts',
children: [
{
icon: 'cut',
text: 'cut',
label: '⌘C',
disabled: false,
disabled: false
}
]
},
@@ -84,7 +78,6 @@ export default [
icon: 'analytics',
iconSize: 18,
text: 'Financial Reports',
href: '/dashboard/accounts',
children: [
{
text: 'Balance Sheet',
@@ -124,14 +117,14 @@ export default [
]
},
{
divider: true,
divider: true
},
{
text: 'Preferences',
href: '/dashboard/preferences',
href: '/dashboard/preferences'
},
{
text: 'Auditing System',
href: '/dashboard/accounts',
},
]
href: '/dashboard/accounts'
}
];