From e5364a42d6f236865f934b59e92731f1eed1fec4 Mon Sep 17 00:00:00 2001
From: Jon Layton <me@jonl.io>
Date: Wed, 17 Oct 2018 01:09:14 -0500
Subject: [PATCH] [bip9] Combine csv and segwit into one, as the enum
 establishes

---
 src/versionbitsinfo.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/versionbitsinfo.cpp b/src/versionbitsinfo.cpp
index ecf348292..d9319aadf 100644
--- a/src/versionbitsinfo.cpp
+++ b/src/versionbitsinfo.cpp
@@ -12,11 +12,7 @@ const struct VBDeploymentInfo VersionBitsDeploymentInfo[Consensus::MAX_VERSION_B
         /*.gbt_force =*/ true,
     },
     {
-        /*.name =*/ "csv",
-        /*.gbt_force =*/ true,
-    },
-    {
-        /*.name =*/ "segwit",
+        /*.name =*/ "csv-segwit",
         /*.gbt_force =*/ true,
     }
 };