Skip to content

N
Neos
Commit aa72124d authored by Chunchi Che's avatar Chunchi Che
Browse files
Options

fix rebase

parent ac2beea7
Pipeline #27211 passed with stages
            in 7 minutes and 15 seconds
            Hide whitespace changes
            Inline Side-by-side
            Showing with 1 addition and 8 deletions
            src/ui/Layout/index.tsx
            View file @ aa72124d
            ...@@ -19,11 +19,8 @@ import { ...@@ -19,11 +19,8 @@ import {
            import { useConfig } from "@/config"; import { useConfig } from "@/config";
            import { accountStore } from "@/stores"; import { accountStore } from "@/stores";
            <<<<<<< HEAD
            import { I18NSelector } from "../I18N"; import { I18NSelector } from "../I18N";
            =======
            import { Setting } from "../Setting"; import { Setting } from "../Setting";
            >>>>>>> d1129464 (feat: 音乐与音效)
            import styles from "./index.module.scss"; import styles from "./index.module.scss";
            import { import {
            getLoginStatus, getLoginStatus,
            ...@@ -143,9 +140,6 @@ export const Component = () => { ...@@ -143,9 +140,6 @@ export const Component = () => {
            ), ),
            }, },
            { {
            <<<<<<< HEAD
            label: logined ? i18n("LogOut") : i18n("Login"),
            =======
            label: "系统设置", label: "系统设置",
            onClick: () => { onClick: () => {
            modal.info({ modal.info({
            ...@@ -158,8 +152,7 @@ export const Component = () => { ...@@ -158,8 +152,7 @@ export const Component = () => {
            }, },
            }, },
            { {
            label: logined ? "退出登录" : "登录萌卡", label: logined ? i18n("LogOut") : i18n("Login"),
            >>>>>>> d1129464 (feat: 音乐与音效)
            onClick: logined ? onLogout : onLogin, 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