From 22de28a9cdc59adbc4ede75de035ead7506bbadb Mon Sep 17 00:00:00 2001
From: roberts <robert.stertz1@hs-augsburg.de>
Date: Sun, 30 Apr 2023 12:14:43 +0200
Subject: [PATCH] resolved merge conflict

---
 src/router/Muscles.js |  0
 src/router/muscle.js  | 13 -------------
 2 files changed, 13 deletions(-)
 create mode 100644 src/router/Muscles.js
 delete mode 100644 src/router/muscle.js

diff --git a/src/router/Muscles.js b/src/router/Muscles.js
new file mode 100644
index 0000000..e69de29
diff --git a/src/router/muscle.js b/src/router/muscle.js
deleted file mode 100644
index 00fd73a..0000000
--- a/src/router/muscle.js
+++ /dev/null
@@ -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 },
-    ]
-};