Commit aa72124d authored by Chunchi Che's avatar Chunchi Che

fix rebase

parent ac2beea7
Pipeline #27211 passed with stages
in 7 minutes and 15 seconds
......@@ -19,11 +19,8 @@ import {
import { useConfig } from "@/config";
import { accountStore } from "@/stores";
<<<<<<< HEAD
import { I18NSelector } from "../I18N";
=======
import { Setting } from "../Setting";
>>>>>>> d1129464 (feat: 音乐与音效)
import styles from "./index.module.scss";
import {
getLoginStatus,
......@@ -143,9 +140,6 @@ export const Component = () => {
),
},
{
<<<<<<< HEAD
label: logined ? i18n("LogOut") : i18n("Login"),
=======
label: "系统设置",
onClick: () => {
modal.info({
......@@ -158,8 +152,7 @@ export const Component = () => {
},
},
{
label: logined ? "退出登录" : "登录萌卡",
>>>>>>> d1129464 (feat: 音乐与音效)
label: logined ? i18n("LogOut") : i18n("Login"),
onClick: logined ? onLogout : onLogin,
},
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment