This should fix things up. I made some fixes and handled the cut/paste error that vila mentioned, and was able to merge it cleanly a few minutes ago and it merged cleanly.
« Back to merge proposal
This should fix things up. I made some fixes and handled the cut/paste error that vila mentioned, and was able to merge it cleanly a few minutes ago and it merged cleanly.