resolved merge conflict

2023-04-30 12:14:43 +02:00 · 2023-04-30 12:14:43 +02:00 · 22de28a9cd
parent a0347a4fc3
commit 22de28a9cd
2 changed files with 0 additions and 13 deletions
--- a/src/router/Muscles.js
+++ b/src/router/Muscles.js
--- a/src/router/muscle.js
+++ b/src/router/muscle.js
@ -1,13 +0,0 @@
-import {Back, Biceps, Chest, Legs, Shoulder, Triceps } from "../views/muscles/Index.js";
-
-export default {
-    path: '/muscles',
-    children: [
-        { path: 'legs', component: Legs },
-        { path: 'back', component: Back },
-        { path: 'chest', component: Chest },
-        { path: 'shoulder', component: Shoulder },
-        { path: 'triceps', component: Triceps },
-        { path: 'biceps', component: Biceps },
-    ]
-};