From: Omar Ferrer <omar.ferrer.uprm_at_gmail.com>
Date: Mon, 13 Jul 2015 10:30:23 -0400

If the maintainers see this, I had created a ticket for this here:

https://java.net/jira/browse/JERSEY-2909

Wasn't sure where the right place to notify was.

Regards,
Omar Ferrer
On Jul 13, 2015 10:27 AM, <Shaun.Burch_at_altec.com> wrote:

> Good morning,
>
> Looks like the merge conflict markers made it onto the site. It's also
> present in documentation.
>
> Example attached:
>
>
> Cheers,
>
> *Shaun Burch*
>
>
>
> * Altec Industries 33 Inverness Center Parkway Birmingham, AL 35242 tel:
> 205-408-8116 <205-408-8116>*
> *Shaun.Burch_at_altec.com* <Shaun.Burch_at_altec.com> <+julia.hawkins_at_altec.com>
>
>
>
> This message (including any attachments) contains confidential
> information intended for a specific individual and purpose, and is
> protected by law. If you are not the intended recipient, you should
> delete this message. Any disclosure, copying, or distribution of this
> message, or the taking of any action based on it, is strictly
> prohibited.