fix:adadadasdasd

src/modules/root/Menu.tsx

@@ -11,16 +11,9 @@ import StoreService from '@/domains/store-domain/storeService';
 import classNames from 'classnames';
 import classNames from 'classnames';
 import User from "@/common/js/user"
 import User from "@/common/js/user"
 import _ from 'underscore';
 import _ from 'underscore';
-<<<<<<< HEAD
-import Bus from '@/core/tbus';
-import { menuList } from '../../routes//config/menuList';
-import { XMContext } from '../../store/context';
-import './Menu.less';
-=======
 import "./Menu.less";
 import "./Menu.less";
 import { display } from 'html2canvas/dist/types/css/property-descriptors/display';
 import { display } from 'html2canvas/dist/types/css/property-descriptors/display';
 import ContactWidget from '@/components/ContactWidget';
 import ContactWidget from '@/components/ContactWidget';
->>>>>>> master
 
 
 const { SubMenu } = Menu;
 const { SubMenu } = Menu;