checkout newest lp:nova and merge it into your branch and you should see the merge errors
« Back to merge proposal
checkout newest lp:nova and merge it into your branch and you should see the merge errors