Commit 3f3d0364 authored by INADA Naoki's avatar INADA Naoki Committed by GitHub
Browse files

Reduce conflict on Misc/NEWS (GH-212) 

use "union" merge strategy for Misc/NEWS.
parent 32e8f9bd
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment