[251123] Merge: develop_si base로 develop을 merge함

2025-11-23 18:45:09 +09:00
parent cbd52e1b98 9fdadd9e32
commit c5f57492a6
45 changed files with 1059 additions and 315 deletions
--- a/com.twin.app.shoptime/src/views/PlayerPanel/PlayerPanel.jsx
+++ b/com.twin.app.shoptime/src/views/PlayerPanel/PlayerPanel.jsx
@@ -28,9 +28,16 @@ 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,