resolve conflict

bertramdev · Aug 2, 2013 · ab67d37 · ab67d37
2 parents 08041bb + af5bfe0
commit ab67d37
Show file tree

Hide file tree

Showing 4 changed files with 2,245 additions and 2 deletions.
diff --git a/HandlebarsAssetPipelineGrailsPlugin.groovy b/HandlebarsAssetPipelineGrailsPlugin.groovy
@@ -2,7 +2,7 @@ import asset.pipeline.AssetHelper
 import asset.pipeline.handlebars.HandlebarsAssetFile
 
 class HandlebarsAssetPipelineGrailsPlugin {
-    def version = "1.0.0-RC4"
+    def version = "1.0.0-RC4.2"
     def grailsVersion = "2.0 > *"
     def title = "Handlebars Asset-Pipeline Plugin"
     def author = "David Estes"

diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ For more information on how to use asset-pipeline, visit [here](http://www.githu
 Usage
 -----
 
-Simply create files in your standard `assets/javascripts` folder with extension `.handlebars` or 'hbs'.
+Simply create files in your standard `assets/javascripts` folder with extension `.handlebars` or `.hbs`.
 By default the templateRoot for your template names is specified as blank. This means that any handlebars file within the root assets/javascripts folder will utilize its file name (without the extension) as its template name. Or a file in `templates/show.handlebars` would be named `templates/show`. If templates is set as the templateRoot than it would be named `show`
 
 It is also possible to change the template path seperator for templatenames to be used by handlebars: