Permalink
Browse files

Fix conflict.

  • Loading branch information...
1 parent c1e98db commit 12928721237faf85cca3e3987cb947e514e02c37 @fadrizul committed Sep 18, 2011
Showing with 0 additions and 1 deletion.
  1. +0 −1 README.md
View
@@ -33,7 +33,6 @@ First we need to declare the extension of your view files. This can be anything
To set values for variable tags, you need to include it as options in res.render() function. In this example we're setting values for {{ name }} and {{ title }}.
###Template inheritance
->>>>>>> Add usage example.
The most powerful part of TwigJS is template inheritance. Template inheritance allows you to build a base “skeleton” template that contains all the common elements of your site and defines blocks that child templates can override.
Sounds complicated but is very basic. It’s easiest to understand it by starting with an example.

0 comments on commit 1292872

Please sign in to comment.