0
0
Fork 0
mirror of https://github.com/VueTubeApp/VueTube synced 2024-12-01 23:47:29 +00:00

merge settings.vue

This commit is contained in:
Alex 2022-04-11 13:19:01 +12:00
parent e85f2f9b32
commit e3568abdac

View file

@ -50,17 +50,7 @@ export default {
to: "/mods/tweaks", to: "/mods/tweaks",
}, },
{ name: "Startup Options", icon: "mdi-restart", to: "/mods/startup" }, { name: "Startup Options", icon: "mdi-restart", to: "/mods/startup" },
<<<<<<< HEAD
{
name: "Plugins",
icon: "mdi-puzzle",
to: "",
to: "/mods/plugins",
disabled: true,
},
=======
{ name: "Plugins", icon: "mdi-puzzle", to: "", to: "/mods/plugins" }, { name: "Plugins", icon: "mdi-puzzle", to: "", to: "/mods/plugins" },
>>>>>>> 94e0108 (Merge branch 'main' of https://github.com/Frontesque/VueTube)
{ {
name: "Updates", name: "Updates",
icon: "mdi-cloud-download-outline", icon: "mdi-cloud-download-outline",