From 1900e2e0d0030b75f4962467a83255fe7e18c06c Mon Sep 17 00:00:00 2001
From: Ignacio Palacios <ignacio.palacios.santos@gmail.com>
Date: Fri, 12 Nov 2021 14:20:53 +0100
Subject: [PATCH] package naming conflict fixed (#753)

---
 Cargo.lock                            | 6 +++---
 polkadot-parachains/Cargo.toml        | 2 +-
 polkadot-parachains/rococo/Cargo.toml | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0b0cc2b6aa..7aa008ee15 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6527,7 +6527,7 @@ dependencies = [
  "polkadot-parachain",
  "polkadot-primitives",
  "polkadot-service",
- "rococo-runtime 0.1.0",
+ "rococo-parachain-runtime",
  "sc-basic-authorship",
  "sc-chain-spec",
  "sc-cli",
@@ -7424,7 +7424,7 @@ dependencies = [
  "polkadot-runtime",
  "polkadot-runtime-parachains",
  "polkadot-statement-distribution",
- "rococo-runtime 0.9.12",
+ "rococo-runtime",
  "sc-authority-discovery",
  "sc-basic-authorship",
  "sc-block-builder",
@@ -8258,7 +8258,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "rococo-runtime"
+name = "rococo-parachain-runtime"
 version = "0.1.0"
 dependencies = [
  "cumulus-pallet-aura-ext",
diff --git a/polkadot-parachains/Cargo.toml b/polkadot-parachains/Cargo.toml
index 647e8f2ca0..0508e956b4 100644
--- a/polkadot-parachains/Cargo.toml
+++ b/polkadot-parachains/Cargo.toml
@@ -19,7 +19,7 @@ hex-literal = "0.2.1"
 async-trait = "0.1.42"
 
 # Parachain runtimes
-rococo-parachain-runtime = { package = "rococo-runtime", path = "rococo" }
+rococo-parachain-runtime = { package = "rococo-parachain-runtime", path = "rococo" }
 shell-runtime = { path = "shell" }
 statemint-runtime = { path = "statemint" }
 statemine-runtime = { path = "statemine" }
diff --git a/polkadot-parachains/rococo/Cargo.toml b/polkadot-parachains/rococo/Cargo.toml
index 20776cc14a..a819da6eea 100644
--- a/polkadot-parachains/rococo/Cargo.toml
+++ b/polkadot-parachains/rococo/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = 'rococo-runtime'
+name = 'rococo-parachain-runtime'
 version = '0.1.0'
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = '2018'