Fix messed up merge

Sorry, dunno how that even happened. What a noob!
puma · Sep 9, 2019 · 8a58dd3 · 8a58dd3
1 parent 86c1704
commit 8a58dd3
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/lib/puma/cluster.rb b/lib/puma/cluster.rb
@@ -74,10 +74,6 @@ def initialize(idx, pid, phase, options)
         @started_at = Time.now
         @last_checkin = Time.now
         @last_status = '{}'
-<<<<<<< HEAD
-=======
-        @dead = false
->>>>>>> Fixes Cluster worker shutdown/restart (#1908)
         @term = false
       end