Description
https://docs.google.com/spreadsheets/d/1uec1H0v3_SsFYNJYDPz4v5wnsLlDt9CXePqePnxcho8/edit#gid=845968345
コンフリクトは開発マージ時に解消します
https://docs.google.com/spreadsheets/d/1uec1H0v3_SsFYNJYDPz4v5wnsLlDt9CXePqePnxcho8/edit#gid=845968345
コンフリクトは開発マージ時に解消します
@wada
レビューお願いいたします
| base | 15f35c468ac718ed27d6e7d9a080b6d63b27f0b0 |
|---|---|
| head | 5da3f6a2759a1f2b482bdfd88aba93257cebd6cb |
| base branch | jolly/jrye-db:develop |
| head branch | jolly/jrye-db:guido_pack |
| 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_item.csv |
| modified | csv/master_item_skill.csv |
| modified | csv/master_limit_break_item_set.csv |
| modified | csv/master_shop.csv |
| modified | csv/master_shop_item.csv |
| modified | csv/master_training_pack.csv |
| modified | csv/master_training_pack_info.csv |