optrader/shoptime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[251123] Merge: PlayerPanel,VideoPlayer,RandomUnit detail_v3버전으로 overwrite

Browse Source
This commit is contained in:
hyeon soo noh
2025-11-23 18:54:54 +09:00
parent c5f57492a6
commit c3395c205a
2 changed files with 1 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
com.twin.app.shoptime/src/views/PlayerPanel/PlayerPanel.jsx
View File

@@ -28,16 +28,9 @@ import {
getMainCategoryShowDetail,
getMainLiveShow,
getMainLiveShowNowProduct,
// <<<<<<< HEAD
} from '../../actions/mainActions';
import * as PanelActions from '../../actions/panelActions';
import { updatePanel } from '../../actions/panelActions';
// =======
// } from "../../actions/mainActions";
// import { getBrandLiveChannelInfo } from "../../actions/brandActions";
// import * as PanelActions from "../../actions/panelActions";
// import { updatePanel } from "../../actions/panelActions";
// >>>>>>> gitlab/develop
import {
CLEAR_PLAYER_INFO,
getChatLog,