diff options
author | Derek Jones <derek.jones@ellislab.com> | 2011-07-02 00:54:49 +0200 |
---|---|---|
committer | Derek Jones <derek.jones@ellislab.com> | 2011-07-02 00:54:49 +0200 |
commit | 8f371a4954ec84f9ea80c26e654a4793714f8a07 (patch) | |
tree | 912d83e6e2adbe136d892f0a41ea1730dc11206a /user_guide/doc_style | |
parent | 806b82448ddccece1311228519dc1410dacd0971 (diff) | |
parent | 4b9c62980599228f070b401c7673dce8085b0c61 (diff) |
hand merged remaining unresolved files following the backout of 648b42a75739, which was a NON-trivial whitespace commit
Diffstat (limited to 'user_guide/doc_style')
-rw-r--r-- | user_guide/doc_style/template.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/user_guide/doc_style/template.html b/user_guide/doc_style/template.html index e25503200..d59d5e4ed 100644 --- a/user_guide/doc_style/template.html +++ b/user_guide/doc_style/template.html @@ -51,7 +51,7 @@ Foo Class <h1>Foo Class</h1> -<p>Brief description of Foo Class. If it extends a native CodeIgniter class, please link to the class in the CodeIgniter documents here.</p> +<p>Brief description of Foo Class. If it extends a native CodeIgniter class, please link to the class in the CodeIgniter documents here.</p> <p class="important"><strong>Important:</strong> This is an important note with <kbd>EMPHASIS</kbd>.</p> |