Fix one more merge conflict

bryanjos · bryanjos · commit 0815fe2f8186 · 2017-08-26T19:30:53.000-05:00
diff --git a/lib/elixir_script/passes/translate/forms/for.ex b/lib/elixir_script/passes/translate/forms/for.ex
@@ -2,11 +2,7 @@ defmodule ElixirScript.Translate.Forms.For do
   @moduledoc false
 
   alias ESTree.Tools.Builder, as: JS
-<<<<<<< HEAD
-  alias ElixirScript.Translate.{Form, Clause, Identifier, Helpers}
-=======
   alias ElixirScript.Translate.{Form, Clause, Helpers, Identifier}
->>>>>>> master
   alias ElixirScript.Translate.Forms.Pattern
 
  def compile({:for, _, generators}, state) do
