Restore NEWS file after incorrect git automerge
1 file changed