From 1c75780da904b2a56c30c693fc3e03d2145614c2 Mon Sep 17 00:00:00 2001 From: vlakoff Date: Tue, 6 Aug 2013 20:25:14 +0200 Subject: Fix a few more merge conflicts --- user_guide_src/source/helpers/smiley_helper.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'user_guide_src/source/helpers/smiley_helper.rst') 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:: -- cgit v1.2.3-24-g4f1b