chore: fix conflict

Finschia · May 9, 2024 · b11db49 · b11db49
1 parent 487a5ed
commit b11db49
Showing 1 changed file with 0 additions and 169 deletions.
diff --git a/x/fswap/keeper/proposal.go b/x/fswap/keeper/proposal.go