Git whipped conflict resolution.#35
Open
cmtruit wants to merge 2 commits intonanliu:masterfrom
cmtruit:cmtruit-conflict
Open
Git whipped conflict resolution.#35cmtruit wants to merge 2 commits intonanliu:masterfrom cmtruit:cmtruit-conflict
cmtruit wants to merge 2 commits intonanliu:masterfrom
cmtruit:cmtruit-conflict
Commits
Commits on Oct 2, 2015
- committed
- committed
