From 67102885dd73280bb6ccc3029b0a594298713283 Mon Sep 17 00:00:00 2001
From: Gavin Wood <gavin@parity.io>
Date: Fri, 30 Apr 2021 17:52:42 +0200
Subject: [PATCH] Chain ID and ParaID don't collide (#425)

---
 cumulus/rococo-parachains/src/cli.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cumulus/rococo-parachains/src/cli.rs b/cumulus/rococo-parachains/src/cli.rs
index e9f8ecce669..a768d84cd54 100644
--- a/cumulus/rococo-parachains/src/cli.rs
+++ b/cumulus/rococo-parachains/src/cli.rs
@@ -62,7 +62,7 @@ pub struct ExportGenesisStateCommand {
 	/// Id of the parachain this state is for.
 	///
 	/// Default: 100
-	#[structopt(long, conflicts_with = "chain")]
+	#[structopt(long)]
 	pub parachain_id: Option<u32>,
 
 	/// Write output in binary. Default is to write in hex.
@@ -70,7 +70,7 @@ pub struct ExportGenesisStateCommand {
 	pub raw: bool,
 
 	/// The name of the chain for that the genesis state should be exported.
-	#[structopt(long, conflicts_with = "parachain-id")]
+	#[structopt(long)]
 	pub chain: Option<String>,
 }
 
-- 
GitLab