merge branch 'master' into 'object_rest_spread'

zdenko · zdenko · commit eeeffef55d4d · 2018-02-04T18:02:51.000+01:00
diff --git a/test/assignment.coffee b/test/assignment.coffee
@@ -967,4 +967,3 @@ test "#4878: Compile error when using destructuring with a splat or expansion in
         []
 
   arrayEq bar(arr), ['a', ['b', 'c', 'd']]
->>>>>>> 794f65fbd74ee9f3839a5f715116e71cf23e24c0

Original file line number	Diff line number	Diff line change
`@@ -967,4 +967,3 @@ test "#4878: Compile error when using destructuring with a splat or expansion in`
`967`	`967`	`[]`
`968`	`968`
`969`	`969`	`arrayEq bar(arr), ['a', ['b', 'c', 'd']]`
`970`		`->>>>>>> 794f65fbd74ee9f3839a5f715116e71cf23e24c0`