fixed some conflict bars that snuck in to the doc.txt
svn: r5015
This commit is contained in:
parent
7c7ada4514
commit
675d3818d9
|
@ -475,11 +475,7 @@ If present, this field should be a list of strings representing
|
||||||
subdirectories of your package. These directories will be used by
|
subdirectories of your package. These directories will be used by
|
||||||
Help Desk as HTML documentation for your package. See
|
Help Desk as HTML documentation for your package. See
|
||||||
_Creating Help Desk Documentation in HTML format_ for more information
|
_Creating Help Desk Documentation in HTML format_ for more information
|
||||||
<<<<<<< .mine
|
|
||||||
on how to write useful HTML Help Desk documentation.
|
on how to write useful HTML Help Desk documentation.
|
||||||
=======
|
|
||||||
on how to use HTML Help Desk documentation.
|
|
||||||
>>>>>>> .r4715
|
|
||||||
|
|
||||||
The _'homepage field_
|
The _'homepage field_
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user