Description
コンフリクト解消しました
- csv/master_gacha.csv
コンフリクト解消しました
@wada
確認OKです
| base | 3b541b74d4ca2999ff6dbe1b2ba081818abb2a7f |
|---|---|
| head | cb22fce9c04dbf7b5fc714fe74d3a5e49e2af62b |
| base branch | jolly/jrye-db:master |
| head branch | jolly/jrye-db:release_022812 |
| 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_limited_gacha_ticket.csv |
| modified | csv/master_trade_release_time.csv |