| commit | 59773dbef8064bc6c122faebbba90cd2a372f15a | |
| author | Eric Schulte <schulte.eric@gmail.com> | |
| Tue, 11 Jan 2011 17:18:48 +0000 (11 10:18 -0700) | ||
| committer | Eric Schulte <schulte.eric@gmail.com> | |
| Tue, 11 Jan 2011 17:18:48 +0000 (11 10:18 -0700) | ||
| tree | d102c69874fb25317b21aaa501ecce88426ef5dc | treesnapshot (tar.gz zip) |
| parent | ea847dcb5f194aa2d9d32dc2d70f21285e72d9f3 | commitdiff |
doc: additional information about resolving org-mode/yasnippet conflicts
Thanks to Jeff Horn for compiling this patch.
* doc/org.texi (Conflicts): Adding additional information about
resolving org/yasnippet conflicts
Thanks to Jeff Horn for compiling this patch.
* doc/org.texi (Conflicts): Adding additional information about
resolving org/yasnippet conflicts
| doc/org.texi | diffblobblamehistory |