resolved merge conflicts

main
roberts 2023-04-30 01:30:29 +02:00
parent fcc8bb95f7
commit a0347a4fc3
3 changed files with 3 additions and 16 deletions

File diff suppressed because one or more lines are too long

2
dist/index.html vendored
View File

@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="UTF-8"><link rel="icon" href="./favicon.ico"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Hello_World_Vue 01</title><script type="module" crossorigin src="./assets/index-ede68436.js"></script></head><body><div id="app"></div></body></html> <!doctype html><html lang="en"><head><meta charset="UTF-8"><link rel="icon" href="./favicon.ico"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Hello_World_Vue 01</title><script type="module" crossorigin src="./assets/index-c13a2228.js"></script></head><body><div id="app"></div></body></html>

View File

@ -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 },
]
};