Merge branch 'master' of github.com:ciddan/grunt-template-helper

Conflicts: README.md package.json test/template-test.coffee
ciddan · Feb 8, 2013 · 8bb1cb5 · 8bb1cb5
2 parents 0f2bd30 + 1fded96
commit 8bb1cb5
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 24 deletions.
diff --git a/README.md b/README.md
@@ -84,4 +84,4 @@ template: {
       'path/to/another.html': ['path/to/more/*.template', 'path/to/even/more/*.template'] // concatenates (individually wrapped) files
   }
 }
-```
+```
diff --git a/test/actual/concat.html b/test/actual/concat.html
diff --git a/test/actual/main.html b/test/actual/main.html
diff --git a/test/actual/wrapped.html b/test/actual/wrapped.html
diff --git a/test/actual/wrappedAdv.html b/test/actual/wrappedAdv.html
diff --git a/test/actual/wrappedConcat.html b/test/actual/wrappedConcat.html
-Original file line number
+Diff line change
@@ Expand Up / @@ -84,4 +84,4 @@ template: { @@
           'path/to/another.html': ['path/to/more/*.template', 'path/to/even/more/*.template'] // concatenates (individually wrapped) files
       }
     }
-    ```
+    ```