Fix merge conflict

nirvana · Aug 23, 2014 · 4e684b2 · 4e684b2
1 parent 085492b
commit 4e684b2
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/lib/flaky/server.ex b/lib/flaky/server.ex
@@ -35,15 +35,7 @@ defmodule Flaky.Server do
     end
   end
 
-<<<<<<< HEAD
-  def handle_cast({ :push, new }, stack) do
-    { :noreply, [new|stack] }
-  end
-
   def time do
-=======
-  defp time do
->>>>>>> 1ae5dcdfa3ed0dc5b78941a1fd8c6f1b6487b5b7
     {mega_seconds, seconds, micro_seconds} = :os.timestamp
     1_000_000_000*mega_seconds + seconds*1_000 + :erlang.trunc(micro_seconds/1_000)
   end