Merge branch 'develop' into fadeev/key-sep

Jerónimo Albi · web-flow · commit 9d91afc8fc3e · 2022-09-07T16:45:25.000+02:00
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+changelog.md merge=union
diff --git a/changelog.md b/changelog.md
@@ -14,6 +14,7 @@
 
 ### Changes
 
+- Add changelog merge strategy in .gitattributes to avoid conflicts.
 - Refactor `templates/app` to remove `monitoringp` module from the default template
 - Updated keyring dependency to match what Cosmos SDK is using
 - Speed up the integration tests
