Merge pull request #2375 from LLITCHEV/FixIssue1884Again
authorLubomir Litchev <LLITCHEV@users.noreply.github.com>
Thu, 17 Dec 2015 20:32:04 +0000 (12:32 -0800)
committerLubomir Litchev <LLITCHEV@users.noreply.github.com>
Thu, 17 Dec 2015 20:32:04 +0000 (12:32 -0800)
commitbd8487aefe82c4b7aab974d3e13ab4e6c5bb6ab6
tree4863f6f4878253ce4e0d941147947b323a4609f2
parent59d8f11fa1ddac3ce02b7c05657761cc720996fd
parentc2b764ec41b3789700a273ac34231f38b234e3eb
Merge pull request #2375 from LLITCHEV/FixIssue1884Again

Fix a bad conflict resolution.
src/jit/morph.cpp