manifoldcf-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Karl Wright <daddy...@gmail.com>
Subject Re: Merge conflict leftover in CHANGES.txt
Date Sat, 25 Feb 2017 21:59:27 GMT
Ok, fixed.
Karl


On Sat, Feb 25, 2017 at 4:18 PM, Markus Schuch <markus_schuch@web.de> wrote:

> Hi Karl,
>
> looks like a merge went wrong in CHANGES.txt (line 35 in trunk)
>
> Came in with r1784298
>
> Regards,
> Markus
>
> ---
> Diese E-Mail wurde von Avast Antivirus-Software auf Viren gepr├╝ft.
> https://www.avast.com/antivirus
>
>

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message