[FileUpload] broken src/changes/changes.xml

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[FileUpload] broken src/changes/changes.xml

garydgregory
The file src/changes/changes.xml is broken. It looks like a merge did not
apply cleanly.

Gary
Reply | Threaded
Open this post in threaded view
|

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

jochen-2
Which branch?

On Mon, May 21, 2018 at 4:11 PM Gary Gregory <[hidden email]> wrote:

> The file src/changes/changes.xml is broken. It looks like a merge did not
> apply cleanly.

> Gary

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

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

garydgregory
On Tue, May 22, 2018 at 5:02 AM, Jochen Wiedmann <[hidden email]>
wrote:

> Which branch?
>

master.

Gary


>
> On Mon, May 21, 2018 at 4:11 PM Gary Gregory <[hidden email]>
> wrote:
>
> > The file src/changes/changes.xml is broken. It looks like a merge did not
> > apply cleanly.
>
> > Gary
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [hidden email]
> For additional commands, e-mail: [hidden email]
>
>