test/conf.d/merger.rb in jeckyl-0.2.7 vs test/conf.d/merger.rb in jeckyl-0.3.7

- old
+ new

@@ -23,9 +23,9 @@ # array of integers sieve [2, 5, 7, 10, 15] # hash of anything my_opts = {:peter=>37, :paul=>40, :birds=>true} -options my_opts +option_set my_opts # string formatted as email address email "robert@osburn-associates.ath.cx" \ No newline at end of file