components/MarketInfoList/MarketInfoListItem.tsx: needs merge
components/MarketInfoList/__tests__/index.test.tsx: needs merge
package-lock.json: needs merge
yarn.lock: needs merge
You must edit all merge conflicts and then
mark them as resolved using git add
TypeScript
복사