From 17fb556f9ed3607e6376d911bb9f3e74316dd3bb Mon Sep 17 00:00:00 2001
From: MSalopek <matija.salopek994@gmail.com>
Date: Thu, 13 Jul 2023 15:09:29 +0200
Subject: [PATCH] docs: update broken md links (#1130)

(cherry picked from commit fd76f45b726f4ef65f817e8032c4f87f986f2d71)

# Conflicts:
#	docs/docs/validators/joining-testnet.md
---
 docs/docs/features/proposals.md         | 2 +-
 docs/docs/validators/joining-testnet.md | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/docs/features/proposals.md b/docs/docs/features/proposals.md
index a34160ecf4..b68fd343d6 100644
--- a/docs/docs/features/proposals.md
+++ b/docs/docs/features/proposals.md
@@ -48,7 +48,7 @@ Minimal example:
     "distribution_transmission_channel": "channel-123"
 }
 ```
-More examples can be found in the replicated security testnet repository [here](https://github.com/cosmos/testnets/blob/master/replicated-security/baryon-1/proposal-baryon-1.json) and [here](https://github.com/cosmos/testnets/blob/master/replicated-security/noble-1/start-proposal-noble-1.json).
+More examples can be found in the replicated security testnet repository [here](https://github.com/cosmos/testnets/blob/master/replicated-security/stopped/baryon-1/proposal-baryon-1.json) and [here](https://github.com/cosmos/testnets/blob/master/replicated-security/stopped/noble-1/start-proposal-noble-1.json).
 
 ## `ConsumerRemovalProposal`
 Proposal type used to suggest removing an existing consumer chain.
diff --git a/docs/docs/validators/joining-testnet.md b/docs/docs/validators/joining-testnet.md
index b9d9f8f9da..6e367186c5 100644
--- a/docs/docs/validators/joining-testnet.md
+++ b/docs/docs/validators/joining-testnet.md
@@ -169,8 +169,15 @@ gaiad tx provider assign-consensus-key consumer-1 '<consumer_pubkey>' --from <ke
 After this step, you are ready to copy the consumer genesis into your nodes's `/config` folder, start your consumer chain node and catch up to the network.
 
 ## Baryon
+<<<<<<< HEAD
 You can find the onboarding repo instructions for the Baryon chain [here](https://github.com/cosmos/testnets/blob/master/replicated-security/baryon-1/README.md)
 
 
 ## Noble
 You can find the onboarding repo instructions for the Noble chain [here](https://github.com/cosmos/testnets/blob/master/replicated-security/noble-1/README.md)
+=======
+You can find the onboarding repo instructions for the Baryon chain [here](https://github.com/cosmos/testnets/blob/master/replicated-security/stopped/baryon-1/README.md)
+
+## Noble
+You can find the onboarding repo instructions for the Noble chain [here](https://github.com/cosmos/testnets/blob/master/replicated-security/stopped/noble-1/README.md)
+>>>>>>> fd76f45 (docs: update broken md links (#1130))