about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorSoispha <soispha@vhack.eu>2024-03-01 16:54:54 +0100
committerSoispha <soispha@vhack.eu>2024-03-01 16:54:54 +0100
commitcbabed0e6d441c6d5f710e44963e77dfb25d9052 (patch)
tree8daa4d943aca066ed7919edc3a50a7cfdfa8f4ce
parentfix(hm/conf/unison): Also try to merge 'log' files (diff)
downloadnixos-config-cbabed0e6d441c6d5f710e44963e77dfb25d9052.tar.gz
nixos-config-cbabed0e6d441c6d5f710e44963e77dfb25d9052.zip
chore(version): v1.36.2
-rw-r--r--CHANGELOG.md10
1 files changed, 10 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index da5d76c5..6cf3eadd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file. See [conventional commits](https://www.conventionalcommits.org/) for commit guidelines.
 
 - - -
+## v1.36.2 - 2024-03-01
+#### Bug Fixes
+- **(hm/conf/unison)** Also try to merge 'log' files - (8e0d4b8) - Soispha
+- **(hm/conf/unison)** Avoid merging, when the merge fails - (d2d0803) - Soispha
+- **(hm/conf/unison)** Correctly use the `file_name` and `extisions` values - (cb0f583) - Soispha
+- **(hm/conf/unison)** Add missing `diff` dependency for diffs - (9f33b43) - Soispha
+- **(hm/conf/unison)** Add further files to auto merge - (0a55b67) - Soispha
+
+- - -
+
 ## v1.36.1 - 2024-02-28
 #### Bug Fixes
 - **(hm/conf/lf/keymappings)** Unmap the later bound keys - (055fbaa) - Soispha