conflicts

cosmos · Dec 16, 2024 · 66ece8e · 66ece8e
1 parent 00ab179
commit 66ece8e
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 1,241 deletions.
diff --git a/README.md b/README.md
@@ -71,13 +71,6 @@ Core dependencies are the core libraries that an application may depend on.
 Core dependencies not mentioned here as compatible across all maintained SDK versions.
 See an exhaustive list of core dependencies at [cosmossdk.io](https://cosmossdk.io).
 
-<<<<<<< HEAD
-| Cosmos SDK | cosmossdk.io/core | cosmossdk.io/api | cosmossdk.io/x/tx |
-| ---------- | ----------------- | ---------------- | ----------------- |
-| 0.52.z     | 1.y.z             | 0.8.z            | 0.14.z            |
-| 0.50.z     | 0.11.z            | 0.7.z            | 0.13.z            |
-| 0.47.z     | 0.5.z             | 0.3.z            | N/A               |
-=======
 | Version                  | v2    | 0.52.z    | 0.50.z         | 0.47.z  |
 | ------------------------ | ----- | --------- | -------------- | ------- |
 | cosmossdk.io/core        | 1.y.z | 1.y.z     | 0.11.z         | 0.5.z   |
@@ -86,7 +79,6 @@ See an exhaustive list of core dependencies at [cosmossdk.io](https://cosmossdk.
 | cosmossdk.io/store       | N/A   | >= 1.10.z | 1.0.0 >= 1.9.z | N/A     |
 | cosmossdk.io/store/v2    | 2.y.z | N/A       | N/A            | N/A     |
 | cosmossdk.io/collections | 1.y.z | 1.y.z     | < 1.y.z        | < 1.y.z |
->>>>>>> 8ff9f48bb (chore: package release prep + update UPGRADING.md (#22864))
 
 #### Module Dependencies
 

diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md
@@ -240,8 +240,6 @@ Those modules can be considered as part of the Cosmos SDK, but features and impr
 ### Modules that do not depend on the Cosmos SDK
 
 Modules that do not depend on the Cosmos SDK can be released at any time from the `main` branch of the Cosmos SDK repository.
-<<<<<<< HEAD
-=======
 
 ## Go Monorepo Branching Strategy
 
@@ -269,4 +267,3 @@ This strategy provides several benefits:
 * Ensure thorough testing of the release branch structure to avoid any integration issues.
 
 This branching strategy helps maintain a clear separation between components tagged from main and those tagged from release branches, while ensuring that release branches accurately represent the state of components that depend on the SDK.
->>>>>>> 8ff9f48bb (chore: package release prep + update UPGRADING.md (#22864))
diff --git a/UPGRADING.md b/UPGRADING.md
diff --git a/collections/CHANGELOG.md b/collections/CHANGELOG.md
diff --git a/core/testing/CHANGELOG.md b/core/testing/CHANGELOG.md
diff --git a/schema/CHANGELOG.md b/schema/CHANGELOG.md
diff --git a/store/CHANGELOG.md b/store/CHANGELOG.md
diff --git a/x/group/go.mod b/x/group/go.mod
@@ -187,10 +187,6 @@ replace (
 	cosmossdk.io/client/v2 => ../../client/v2
 	cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20241204123127-eb3bf8b0469d // main
 	cosmossdk.io/x/accounts => ../accounts
-<<<<<<< HEAD
-	cosmossdk.io/x/authz => ../authz
-=======
->>>>>>> 8ff9f48bb (chore: package release prep + update UPGRADING.md (#22864))
 	cosmossdk.io/x/bank => ../bank
 	cosmossdk.io/x/consensus => ../consensus
 	cosmossdk.io/x/epochs => ../epochs