Re: [Orgmode] [PATCH] Fix conflict doc

2011-01-11 Thread Eric Schulte
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

[Orgmode] [PATCH] Fix conflict doc

2011-01-10 Thread Jeff Horn
(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. -- Jeffrey Horn http://www.failuretorefrain.com/jeff/