adfjnadfskmnfdaskjnkjnasdfjnkfads

Snail-IDE · May 13, 2024 · 8eadf16 · 8eadf16
1 parent fe3e2f9
commit 8eadf16
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 43 deletions.
diff --git a/src/components/menu-bar/menu-bar.jsx b/src/components/menu-bar/menu-bar.jsx
@@ -813,34 +813,6 @@ class MenuBar extends React.Component {
                                 </div>
                             </div>
                         )}
-<<<<<<< HEAD
-                        {this.props.onClickOptions && (
-                            <div
-                                className={classNames(styles.menuBarItem, styles.hoverable, {
-                                    [styles.active]: this.props.optionsMenuOpen
-                                })}
-                                onMouseUp={this.props.onClickOptions}
-                            >
-                                <div className={classNames(styles.optionsMenu)}>
-                                    Options
-                                </div>
-                                <MenuBarMenu
-                                    className={classNames(styles.menuBarMenu)}
-                                    open={this.props.optionsMenuOpen}
-                                    place={this.props.isRtl ? 'left' : 'right'}
-                                    onRequestClose={this.props.onRequestCloseOptions}
-                                >
-                                    <MenuSection>
-                                        <MenuItem onClick={this.props.onClickSettings}>
-                                            <FormattedMessage
-                                                defaultMessage="Gameplay Settings"
-                                                description="Menu bar item for gameplay settings"
-                                                id="pm.menuBar.moreSettings"
-                                            />
-                                        </MenuItem>
-                                    </MenuSection>
-                                </MenuBarMenu>
-=======
                         <div
                             className={classNames(styles.menuBarItem, styles.hoverable)}
                             onMouseUp={this.props.onClickSettings}
@@ -851,7 +823,6 @@ class MenuBar extends React.Component {
                                     description="Text for gameplay settings menu item"
                                     id="pm.menuBar.gameplaySettings"
                                 />
->>>>>>> parent of f7263e772 (next theme)
                             </div>
                         </div>
                     </div>
@@ -1104,4 +1075,4 @@ export default compose(
         mapStateToProps,
         mapDispatchToProps
     )
-)(MenuBar);
+)(MenuBar);
diff --git a/src/components/menu/menu.jsx b/src/components/menu/menu.jsx
@@ -2,20 +2,7 @@ import classNames from 'classnames';
 import PropTypes from 'prop-types';
 import React from 'react';
 
-<<<<<<< HEAD
-import newStyles from './menu.css';
-import oldStyles from './old-menu.css';
-
-const useLegacyTheme = localStorage.getItem("sn:useOldTheme") ?? "false";
-let styles;
-if (useLegacyTheme === "true") {
-    styles = oldStyles;
-} else {
-    styles = oldStyles;
-}
-=======
 import styles from './menu.css';
->>>>>>> parent of f7263e772 (next theme)
 
 const MenuComponent = ({
     className = '',