diff options
author | vlakoff <vlakoff@gmail.com> | 2013-08-06 20:25:14 +0200 |
---|---|---|
committer | vlakoff <vlakoff@gmail.com> | 2013-08-07 09:51:13 +0200 |
commit | 1c75780da904b2a56c30c693fc3e03d2145614c2 (patch) | |
tree | d9aaf2756135df57af12001fc4955099c457d628 /user_guide_src/source/helpers/smiley_helper.rst | |
parent | c0b55d53004105bca7f7979931d46fd848e21be0 (diff) |
Fix a few more merge conflicts
Diffstat (limited to 'user_guide_src/source/helpers/smiley_helper.rst')
-rw-r--r-- | user_guide_src/source/helpers/smiley_helper.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/user_guide_src/source/helpers/smiley_helper.rst b/user_guide_src/source/helpers/smiley_helper.rst index 7ac91c345..0601f0244 100644 --- a/user_guide_src/source/helpers/smiley_helper.rst +++ b/user_guide_src/source/helpers/smiley_helper.rst @@ -48,7 +48,7 @@ View as described. The Controller -------------- -In your `application/controllers/` folder, create a file called +In your **application/controllers/** directory, create a file called Smileys.php and place the code below in it. .. important:: Change the URL in the :func:`get_clickable_smileys()` @@ -75,7 +75,7 @@ the :doc:`Table Class <../libraries/table>`:: } -In your `application/views/` folder, create a file called `smiley_view.php` +In your **application/views/** folder, create a file called **smiley_view.php** and place this code in it:: <html> |