Merge pull request #407 from cosmos/sean/chore-merge-conflicts-ica

sean/resolve merge conflicts ica
cosmos · Sep 15, 2021 · 7c7bf8e · 7c7bf8e
2 parents e0cef86 + b5ad323
commit 7c7bf8e
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/proto/ibc/applications/transfer/v1/transfer.proto b/proto/ibc/applications/transfer/v1/transfer.proto
@@ -6,7 +6,6 @@ option go_package = "github.com/cosmos/ibc-go/modules/apps/transfer/types";
 
 import "gogoproto/gogo.proto";
 
-
 // DenomTrace contains the base denomination for ICS20 fungible tokens and the
 // source tracing information path.
 message DenomTrace {

diff --git a/proto/ibc/applications/transfer/v2/packet.proto b/proto/ibc/applications/transfer/v2/packet.proto
@@ -17,4 +17,3 @@ message FungibleTokenPacketData {
   // the recipient address on the destination chain
   string receiver = 4;
 }
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,4 +17,3 @@ message FungibleTokenPacketData {
		// the recipient address on the destination chain
		string receiver = 4;
		}