Most of the conflicts are either ^M repairs, or short-php-opens. I haven't looked too hard. Also, I haven't even checked if this code works, this was just getting my branch up to date with yours. There may be more commits coming.

Hi Rob Thomas

Thanks for the updates.
Merge conflicts are there, are you planning to add more commits on this branch?

The merge conflicts aren't really fixable, if you look through them, because they're differences in the entire file (eg, remove ^M's) or different ways of doing things. You get to pick what you want to merge 8)

Github has a surprisingly good 'resolve conflicts' button.

Alright. I will look at that.

[image: Mailtrack]
<https://mailtrack.io?utm_source=gmail&utm_medium=signature&utm_campaign=signaturevirality4&>
Sender
notified by
Mailtrack
<https://mailtrack.io?utm_source=gmail&utm_medium=signature&utm_campaign=signaturevirality4&>

Best Regards

Samir Doshi
iNextrix Technologies Pvt. Ltd.
http://www.inextrix.com

Disclaimer:
The information contained in this communication is confidential and may be
legally privileged. It is intended solely for the use of the individual or
entity to whom it is addressed and others authorized to receive it. If you
are not the intended recipient you are hereby notified that any disclosure,
copying, distribution or taking action in reliance on the contents of this
information is strictly prohibited and may be unlawful. Please notify the
sender immediately and destroy all copies of this message and any
attachments contained in it.

On Thu, May 3, 2018 at 11:51 AM, Rob Thomas <notifications@github.com>
wrote:

> The merge conflicts aren't really fixable, if you look through them,
> because they're differences in the entire file (eg, remove ^M's) or
> different ways of doing things. You get to pick what you want to merge 8)
>
> —
> You are receiving this because you commented.
> Reply to this email directly, view it on GitHub
> <https://github.com/iNextrix/ASTPP/pull/414#issuecomment-386200966>, or mute
> the thread
> <https://github.com/notifications/unsubscribe-auth/AA6gceMQIbd3Pg7mGRGvt7fIiHZSe4WSks5tuqHhgaJpZM4TrLwM>
> .
>

I'm not going to persevere with this pull request, as it's just getting more and more stale. Plus commits like https://github.com/iNextrix/ASTPP/commit/309a35a5f1bc2a8aa4fb44deff1cbf3103669528 where one file was randomly placed inside another (breaking all CDRs) really disheartens me.

Hi Rob,

That was unfortunate bug and I hope there will not be any other.

How would you like to keep your branch running?

On Sun 13 May, 2018, 4:33 AM Rob Thomas, <notifications@github.com> wrote:

> Closed ASTPPCOM-414 <https://github.com/iNextrix/ASTPP/pull/414>.
>
> —
> You are receiving this because you commented.
> Reply to this email directly, view it on GitHub
> <https://github.com/iNextrix/ASTPP/pull/414#event-1623360854>, or mute
> the thread
> <https://github.com/notifications/unsubscribe-auth/AA6gcZxovK3PWXnNq4brRfs8lMMvjx61ks5tx2otgaJpZM4TrLwM>
> .
>