Save merge changes

bryanjos · bryanjos · commit b570742a3220 · 2017-08-26T19:30:09.000-05:00
diff --git a/lib/elixir_script/passes/translate/forms/for.ex b/lib/elixir_script/passes/translate/forms/for.ex
@@ -27,12 +27,8 @@ defmodule ElixirScript.Translate.Forms.For do
       [JS.array_expression(args.patterns), fun, filter]
     )
 
-<<<<<<< HEAD
-    members = ["Elixir", "Collectable", "__load"]
-=======
     members = ["Elixir", "Collectable" , "__load"]
 
->>>>>>> master
     collectable = Helpers.call(
       Identifier.make_namespace_members(members),
       [JS.identifier("Elixir")]
diff --git a/package.json b/package.json
@@ -24,11 +24,7 @@
   "license": "MIT",
   "dependencies": {
     "erlang-types": "^1.0.1",
-<<<<<<< HEAD
-    "tailored": "^2.7.1"
-=======
     "tailored": "^2.7.2"
->>>>>>> master
   },
   "devDependencies": {
     "ava": "^0.21.0",
diff --git a/yarn.lock b/yarn.lock
@@ -3712,15 +3712,9 @@ table@^4.0.1:
     slice-ansi "0.0.4"
     string-width "^2.0.0"
 
-<<<<<<< HEAD
-tailored@^2.7.1:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/tailored/-/tailored-2.7.1.tgz#87858d309e7c17b22706207cd300c51d1c7cff80"
-=======
 tailored@^2.7.2:
   version "2.7.2"
   resolved "https://registry.yarnpkg.com/tailored/-/tailored-2.7.2.tgz#01ab31b9bcacdb33f44da7aaa54fd7beffa1bd0e"
->>>>>>> master
   dependencies:
     erlang-types "^1.0.1"
 
