Re: [PATCH] Fix conflict doc

["Eric Schulte" <schulte.eric@gmail.com>]

Hi Jeff,

Thanks for putting this patch together, I've just checked it out and it
looks great.  It is now applied to the repository.

Also, thanks for submitting a documentation patch, the manual is an
incredible resource, and constant attention like this issue pointed out
by Puneeth and yourself are required to maintain it's usefulness.

If you think you may be submitting more patches in the future you may
want to consider going through the FSF assignment process [1].  The
process takes a while so it's best to have it completed before you have
a patch waiting in the wings.  Normally I wouldn't have been able to
apply this patch without you going through the process because it is
over 10 lines long, but since much of the patch consists of code
originally written by myself, I think it is ok this time.

Thanks for the contribution! -- Eric

Jeff Horn <jrhorn424@gmail.com> writes:

> (Eric, mind glancing at the patch?)
>
> In regard to the following message:
>
>     http://article.gmane.org/gmane.emacs.orgmode/35931
>
> This patch incorporates Eric Schulte's method of making org-mode work
> with yasnippet into the documentation.

Footnotes: 
[1]  http://orgmode.org/worg/org-contribute.html