Re: [FileUpload] broken src/changes/changes.xml

2018-05-22 Thread Gary Gregory
On Tue, May 22, 2018 at 5:02 AM, Jochen Wiedmann wrote: > Which branch? > master. Gary > > On Mon, May 21, 2018 at 4:11 PM Gary Gregory > wrote: > > > The file src/changes/changes.xml is broken. It looks like a merge did not > > apply cleanly. > > > Gary > > -

Re: [FileUpload] broken src/changes/changes.xml

2018-05-22 Thread Jochen Wiedmann
Which branch? On Mon, May 21, 2018 at 4:11 PM Gary Gregory wrote: > The file src/changes/changes.xml is broken. It looks like a merge did not > apply cleanly. > Gary - To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org

[FileUpload] broken src/changes/changes.xml

2018-05-21 Thread Gary Gregory
The file src/changes/changes.xml is broken. It looks like a merge did not apply cleanly. Gary