git-annex automatic merge conflict fix

This commit is contained in:
Mateusz Maciejewski
2025-04-22 12:33:57 +02:00
2 changed files with 1 additions and 0 deletions
@@ -0,0 +1 @@
/annex/objects/SHA256E-s104857600--291310d48ad9091f78a8ac5cacfea02116dc9c89c2eac4e8520da1bae9875405.img