Merge pull request #580 from TrevorS/patch-1

Typo, an -> and.
yeoman · Aug 4, 2015 · 7f9edaf · 7f9edaf
2 parents 52166c2 + 4295995
commit 7f9edaf
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/README.md b/README.md
@@ -291,7 +291,7 @@ Attributes:
 * `options`: options of the `Gruntfile.js` for this step (e.g. if the step is named `foo`, holds configuration of the `Gruntfile.js` associated to the attribute `foo`)
 
 ###### `block`
-The actual looked-at block, parsed an put in a structure.
+The actual looked-at block, parsed and put in a structure.
 
 Example:
 The following block