From bef2e4e582fa4e5ffadad342cb755f0b8f0f2a7a Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Wed, 5 Mar 2025 16:41:39 +0200 Subject: [PATCH] Revert "hicli/sync: don't fail sync if database is locked" This reverts commit 3990427c9763e9a81d7e4ddbc6dd3d8717405fd3. --- desktop/go.sum | 5 ----- 1 file changed, 5 deletions(-) diff --git a/desktop/go.sum b/desktop/go.sum index d248061..ea0e808 100644 --- a/desktop/go.sum +++ b/desktop/go.sum @@ -169,7 +169,6 @@ github.com/yuin/goldmark v1.7.8 h1:iERMLn0/QJeHFhxSt3p6PeN9mGnvIKSpG9YYorDMnic= github.com/yuin/goldmark v1.7.8/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E= <<<<<<< HEAD <<<<<<< HEAD -<<<<<<< HEAD go.mau.fi/util v0.8.4-0.20250106152331-30b8c95e7d7a h1:D9RCHBFjxah9F/YB7amvRJjT2IEOFWcz8jpcEY8dBV0= go.mau.fi/util v0.8.4-0.20250106152331-30b8c95e7d7a/go.mod h1:MOfGTs1CBuK6ERTcSL4lb5YU7/ujz09eOPVEDckuazY= ======= @@ -180,10 +179,6 @@ go.mau.fi/util v0.8.3-0.20241212004537-24c1a9b1d8f6/go.mod h1:sWpI/kFgk/QP4BDJJw go.mau.fi/util v0.8.3 h1:sulhXtfquMrQjsOP67x9CzWVBYUwhYeoo8hNQIpCWZ4= go.mau.fi/util v0.8.3/go.mod h1:c00Db8xog70JeIsEvhdHooylTkTkakgnAOsZ04hplQY= >>>>>>> 49a277f (dependencies: update) -======= -go.mau.fi/util v0.8.4-0.20241217203137-4aa8973d6dbc h1:55919oheHZLQktzYU2z9KSJ5KHXq34dYedoGFfdUcsg= -go.mau.fi/util v0.8.4-0.20241217203137-4aa8973d6dbc/go.mod h1:c00Db8xog70JeIsEvhdHooylTkTkakgnAOsZ04hplQY= ->>>>>>> 2552fde (hicli/sync: don't fail sync if database is locked) go.mau.fi/zeroconfig v0.1.3 h1:As9wYDKmktjmNZW5i1vn8zvJlmGKHeVxHVIBMXsm4kM= go.mau.fi/zeroconfig v0.1.3/go.mod h1:NcSJkf180JT+1IId76PcMuLTNa1CzsFFZ0nBygIQM70= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=