fixing merge issues for comment tweaks

This commit is contained in:
Dayle Rees
2012-07-31 16:55:02 +01:00
21 changed files with 65 additions and 74 deletions

View File

@@ -10,7 +10,7 @@
<a name="the-basics"></a>
## The Basics
Your application probably uses a common layout across most of its pages. Manually creating this layout within every controller action can be a pain. Specifying a controller layout will make your develompent much more enjoyable. Here's how to get started:
Your application probably uses a common layout across most of its pages. Manually creating this layout within every controller action can be a pain. Specifying a controller layout will make your development much more enjoyable. Here's how to get started:
#### Specify a "layout" property on your controller: