From 8a58dd3c28fe3d10462717f402cf1549d45c2509 Mon Sep 17 00:00:00 2001
From: Nate Berkopec <nate.berkopec@gmail.com>
Date: Mon, 9 Sep 2019 13:07:57 +0000
Subject: [PATCH] Fix messed up merge

Sorry, dunno how that even happened. What a noob!
---
 lib/puma/cluster.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/puma/cluster.rb b/lib/puma/cluster.rb
index 69eb059da4..24f4ea5f85 100644
--- 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