Merge branch 'master' into traceur

Conflicts: package.json
2015-01-05 00:53:59 +11:00
parent 2b333de81f 655cc8fcb9
commit a6fda01fa0
8 changed files with 8 additions and 8 deletions
--- a/test/fixtures/transformation/esnext-es6-classes/.getter-setter-super.js
+++ b/test/fixtures/transformation/esnext-es6-classes/.getter-setter-super.js
--- a/test/fixtures/transformation/esnext-es6-classes/.super-change-proto.js
+++ b/test/fixtures/transformation/esnext-es6-classes/.super-change-proto.js
--- a/test/fixtures/transformation/spec-no-duplicate-properties/identifiers/actual.js
+++ b/test/fixtures/transformation/spec-no-duplicate-properties/identifiers/actual.js
@@ -1 +0,0 @@
-var obj = { a: 1, a: 2 };
--- a/test/fixtures/transformation/spec-no-duplicate-properties/literals/actual.js
+++ b/test/fixtures/transformation/spec-no-duplicate-properties/literals/actual.js
@@ -1 +0,0 @@
-var obj = { "a": 1, "a": 2 };
--- a/test/fixtures/transformation/spec-no-duplicate-properties/mixed/actual.js
+++ b/test/fixtures/transformation/spec-no-duplicate-properties/mixed/actual.js
@@ -1 +0,0 @@
-var obj = { a: 1, "a": 2 };
--- a/test/fixtures/transformation/spec-no-duplicate-properties/options.json
+++ b/test/fixtures/transformation/spec-no-duplicate-properties/options.json
@@ -1,3 +0,0 @@
-{
-  "throws": "Duplicate property key"
-}