Fix merge conflicts

Author: p-offtermatt

.changelog/config.toml

@@ -0,0 +1,21 @@
+project_url = "https://github.com/cosmos/interchain-security"
+
+# Settings related to components/sub-modules. Only relevant if you make use of
+# components/sub-modules.
+[components]
+
+# The title to use for the section of entries not relating to a specific
+# component.
+general_entries_title = "General"
+
+# The number of spaces to inject before each component-related entry.
+entry_indent = 2
+
+    # The components themselves. Each component has a name (used when rendered
+    # to Markdown) and a path relative to the project folder (i.e. relative to
+    # the parent of the `.changelog` folder).
+    [components.all]
+    provider = { name = "Provider", path = "x/ccv/provider" }
+    consumer = { name = "Consumer", path = "x/ccv/consumer" }
+    tests = { name = "Tests", path = "tests" }
+    docs = { name = "Documentation", path = "docs/docs" }

.changelog/epilogue.md

@@ -72,7 +72,7 @@ updates:
     directory: "/"
     schedule:
       interval: daily
-    target-branch: "release/v3.2.x-consumer"
+    target-branch: "release/v3.2.x"
     # Only allow automated security-related dependency updates on release branches.
     open-pull-requests-limit: 0
     labels:

.changelog/unreleased/api-breaking/provider/1340-add-cryptographic-verification-of-equivocation-feature.md

@@ -29,7 +29,7 @@ jobs:
           path: "."
 
       - name: Setup Node.js 🔧
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: "16.x"
 

.changelog/unreleased/bug-fixes/consumer/1146-pending-packets.md

@@ -9,7 +9,7 @@ on:
       - main
       - feat/*
 jobs:
-  tests:
+  Gosec:
     runs-on: ubuntu-latest
     env:
       GO111MODULE: on

.changelog/unreleased/bug-fixes/consumer/1150-revert-wire-breaking.md

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: bufbuild/buf-setup-action@v1.27.0
+      - uses: bufbuild/buf-setup-action@v1.28.1
       - uses: bufbuild/buf-push-action@v1
         with:
           input: "proto"

.changelog/unreleased/bug-fixes/consumer/1244-validate-transfer.md

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: bufbuild/buf-setup-action@v1.27.0
+      - uses: bufbuild/buf-setup-action@v1.28.1
       - uses: bufbuild/buf-breaking-action@v1
         with:
           input: "proto"