summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAshley Penney <ashley.penney@puppetlabs.com>2014-03-11 09:29:46 -0700
committerAshley Penney <ashley.penney@puppetlabs.com>2014-03-11 09:29:46 -0700
commit6a89e1cee4be5c413b354f8facd677ba2fe637d7 (patch)
tree83d90873733ed734d085f81bf808877a6b118b7b
parente6c1aa6a02996e97db48110b5baa7a0339315cee (diff)
parent908db6d403e16e345a78427e8eef397d5f8533e8 (diff)
Merge pull request #221 from puphpet/hash-fix
hash example has misplaced comas
-rw-r--r--README.markdown4
1 files changed, 2 insertions, 2 deletions
diff --git a/README.markdown b/README.markdown
index 1e70f39..76c546f 100644
--- a/README.markdown
+++ b/README.markdown
@@ -650,8 +650,8 @@ Merges two or more hashes together and returns the resulting hash.
For example:
- $hash1 = {'one' => 1, 'two', => 2}
- $hash2 = {'two' => 'dos', 'three', => 'tres'}
+ $hash1 = {'one' => 1, 'two' => 2}
+ $hash2 = {'two' => 'dos', 'three' => 'tres'}
$merged_hash = merge($hash1, $hash2)
# The resulting hash is equivalent to:
# $merged_hash = {'one' => 1, 'two' => 'dos', 'three' => 'tres'}