Description
https://docs.google.com/spreadsheets/d/16E3RZBB3fEgxM7U-XX9NFRQJlGAMzb9kfBxWRoqT_uc/edit#gid=305527652
コンフリクトはマージ時に解消
https://docs.google.com/spreadsheets/d/16E3RZBB3fEgxM7U-XX9NFRQJlGAMzb9kfBxWRoqT_uc/edit#gid=305527652
コンフリクトはマージ時に解消
| base | 42decb76e6cde66de9d407913c685480a2ef0492 |
|---|---|
| head | 34035af7d78696aa66fd02f9a50cf2e09fefcdd0 |
| base branch | jolly/jrye-db:develop |
| head branch | jolly/jrye-db:battle_event_26 |
| status | file |
|---|---|
| modified | csv/master_card.csv |
| modified | csv/master_card_limit_breakthrough.csv |
| modified | csv/master_card_skill.csv |
| modified | csv/master_composition_bonus.csv |
| modified | csv/master_event_ranking_reward.csv |
| modified | csv/master_event_ranking_reward_item.csv |
| modified | csv/master_event_reward.csv |
| modified | csv/master_event_reward_item.csv |
| modified | csv/master_item.csv |
| modified | csv/master_item_private_drink.csv |
| modified | csv/master_item_skill.csv |
| modified | csv/master_limit_break_item_set.csv |
| modified | csv/master_trade_release_time.csv |