Description
以下ファイルのコンフリクト解消
csv/master_card_skill.csv
csv/master_item.csv
csv/master_item_private_drink.csv以下ファイルのコンフリクト解消
csv/master_card_skill.csv
csv/master_item.csv
csv/master_item_private_drink.csv| base | d5c3702b872eb05c33681dcd9ecb3e60dcd7f585 |
|---|---|
| head | fbd160852777605989508485f432e72c7af4f6a3 |
| base branch | jolly/jrye-db:master |
| head branch | jolly/jrye-db:release_0630 |
| status | file |
|---|---|
| modified | csv/master_card.csv |
| modified | csv/master_card_skill.csv |
| modified | csv/master_card_text.csv |
| modified | csv/master_composition_bonus.csv |
| modified | csv/master_gacha.csv |
| modified | csv/master_gacha_item_rare.csv |
| modified | csv/master_item.csv |
| modified | csv/master_item_private_drink.csv |
| modified | csv/master_trade_release_time.csv |