From 1613e520910c4a50cca62e11faca0a786811afbf Mon Sep 17 00:00:00 2001
From: Amaury M <1293565+amaurym@users.noreply.github.com>
Date: Fri, 5 Mar 2021 15:00:33 +0100
Subject: [PATCH] Make proto gen

---
 docs/core/proto-docs.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/core/proto-docs.md b/docs/core/proto-docs.md
index de2207d7a470..9e985a6a6a1b 100644
--- a/docs/core/proto-docs.md
+++ b/docs/core/proto-docs.md
@@ -80,6 +80,7 @@
     - [Output](#cosmos.bank.v1beta1.Output)
     - [Params](#cosmos.bank.v1beta1.Params)
     - [SendEnabled](#cosmos.bank.v1beta1.SendEnabled)
+    - [Supply](#cosmos.bank.v1beta1.Supply)
   
 - [cosmos/bank/v1beta1/genesis.proto](#cosmos/bank/v1beta1/genesis.proto)
     - [Balance](#cosmos.bank.v1beta1.Balance)
@@ -1560,7 +1561,6 @@ sendable).
 
 
 
-<<<<<<< HEAD
 
 <a name="cosmos.bank.v1beta1.Supply"></a>
 
@@ -1578,8 +1578,6 @@ This message is deprecated now that supply is indexed by denom.
 
 
 
-=======
->>>>>>> e17953ab112244fece1534b386517bf9cd44ce05
  <!-- end messages -->
 
  <!-- end enums -->