git merge king dev
Auto-merging package.json
CONFLICT (content): Merge conflict in package.json
Automatic merge failed; fix conflicts and then commit the result.
Conversation
Notices
-
はむ (aximov@mstdn.maud.io)'s status on Saturday, 18-Aug-2018 23:04:11 JST
はむ