diff options
| author | Gustaf Rydholm <gustaf.rydholm@gmail.com> | 2024-02-22 00:08:38 +0100 |
|---|---|---|
| committer | Gustaf Rydholm <gustaf.rydholm@gmail.com> | 2024-02-22 00:08:38 +0100 |
| commit | fb80b46a2eb14ecefd53ca6e35311be5c657d9d9 (patch) | |
| tree | 1ad6133fcd34a7582b4065ae53d1ac16b216e05f | |
| parent | 78e4bbdb2d5105c638001c81ab7a04755cbb6fe1 (diff) | |
Update git-conflicts
| -rw-r--r-- | fnl/plugins/git-conflicts.fnl | 2 | ||||
| -rw-r--r-- | lazy-lock.json | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fnl/plugins/git-conflicts.fnl b/fnl/plugins/git-conflicts.fnl index 4a4583b..3898dac 100644 --- a/fnl/plugins/git-conflicts.fnl +++ b/fnl/plugins/git-conflicts.fnl @@ -1,3 +1,3 @@ ;; Resolve git conflicts. -{1 :akinsho/git-conflict.nvim :event :BufReadPre :tag "v1.0.0" :config true} +{1 :akinsho/git-conflict.nvim :event :BufReadPre :version "*" :config true} diff --git a/lazy-lock.json b/lazy-lock.json index 78860f2..2515434 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -15,7 +15,7 @@ "easyread.nvim": { "branch": "main", "commit": "0b07e315a4cd7d700c4a794bdddbec79fdc2628b" }, "flit.nvim": { "branch": "main", "commit": "39e3399ed2cbc328778258ac0d497ece9ed8fe32" }, "friendly-snippets": { "branch": "main", "commit": "dbd45e9ba76d535e4cba88afa1b7aa43bb765336" }, - "git-conflict.nvim": { "branch": "main", "commit": "80bc8931d4ed8c8c4d289a08e1838fcf4741408d" }, + "git-conflict.nvim": { "branch": "main", "commit": "4c8e252b87d54d944c1e56bfb477f78b6fdaf661" }, "git-worktree.nvim": { "branch": "master", "commit": "f247308e68dab9f1133759b05d944569ad054546" }, "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, "harpoon": { "branch": "harpoon2", "commit": "a38be6e0dd4c6db66997deab71fc4453ace97f9c" }, |