doc: fixes to "yasnippet" sub-section in Conflicts
commit6b5953818b9159d99018efb0ad99828541964db8
authorEric Schulte <schulte.eric@gmail.com>
Fri, 14 Jan 2011 13:30:36 +0000 (14 06:30 -0700)
committerEric Schulte <schulte.eric@gmail.com>
Fri, 14 Jan 2011 13:30:36 +0000 (14 06:30 -0700)
treefb38d4c58cd29067115aeddff216545ead6ad0b8
parent163cd58ffd6461c98a96b1b63a3cf082b2825a52
doc: fixes to "yasnippet" sub-section in Conflicts

* doc/org.texi (Conflicts): Changed "yasnippets" to "yasnippet" and
  added extra whitespace around functions to be consistent with the
  rest of the section.
doc/org.texi