git-annex automatic merge conflict fix

gin-cli-1.11dev-linux.tar.gz

@@ -1 +1 @@
-/annex/objects/MD5-s7315777--efba86e4aa4e8374a3687c6df19619e4
+/annex/objects/MD5-s7318169--9beafb16a211bde50a242a44cdebed8d

gin-cli-1.11dev-macos.tar.gz

@@ -1 +1 @@
-/annex/objects/MD5-s7157635--6112b74f6d824c158a6bc3812849d72a
+/annex/objects/MD5-s7158164--cc13765d86b9652e3dbc75fb9e2c4920

gin-cli-1.11dev-windows32.zip

@@ -1 +1 @@
-/annex/objects/MD5-s139563104--1493bf76b2c0ca1b5e56f5c87a05fe69
+/annex/objects/MD5-s140170196--7ecb8483549e15562f7e0010ce0de4b3

gin-cli-1.11dev-windows64.zip

@@ -1 +1 @@
-/annex/objects/MD5-s139487278--e93669633f752315b61934364f8ac53c
+/annex/objects/MD5-s140093696--5dd466ba2576139ff5f067084da5d796

gin-cli-1.11dev.deb

@@ -1 +1 @@
-/annex/objects/MD5-s34742088--c0b5f4adf8b1271aadeeeecef74e3754
+/annex/objects/MD5-s34743144--41513a80b3a69250469797ad1df663ed

gin-cli-latest-linux.tar.variant-fe0a.gz

@@ -0,0 +1 @@
+/annex/objects/MD5-s7318169--9beafb16a211bde50a242a44cdebed8d

gin-cli-latest-macos.tar.variant-34ae.gz

@@ -0,0 +1 @@
+/annex/objects/MD5-s7158164--cc13765d86b9652e3dbc75fb9e2c4920

gin-cli-latest-windows32.variant-e9a6.zip

@@ -0,0 +1 @@
+/annex/objects/MD5-s140170196--7ecb8483549e15562f7e0010ce0de4b3

gin-cli-latest-windows64.variant-5090.zip

@@ -0,0 +1 @@
+/annex/objects/MD5-s140093696--5dd466ba2576139ff5f067084da5d796

gin-cli-latest.variant-d034.deb

@@ -0,0 +1 @@
+/annex/objects/MD5-s34743144--41513a80b3a69250469797ad1df663ed