diff options
| author | Gustaf Rydholm <gustaf.rydholm@gmail.com> | 2024-05-11 22:49:26 +0200 |
|---|---|---|
| committer | Gustaf Rydholm <gustaf.rydholm@gmail.com> | 2024-05-11 22:49:26 +0200 |
| commit | 04c2b6c07fdf711d983a9afd4d1ca5deb84d2102 (patch) | |
| tree | 86247bb23bc5f02f7f6e57d71fc76734ff904c01 /fnl/plugins/git-conflicts.fnl | |
| parent | 92291b8dd1e1bea07404a34eb83c89a095e5b3a8 (diff) | |
Rename git-conflict
Diffstat (limited to 'fnl/plugins/git-conflicts.fnl')
| -rw-r--r-- | fnl/plugins/git-conflicts.fnl | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/fnl/plugins/git-conflicts.fnl b/fnl/plugins/git-conflicts.fnl deleted file mode 100644 index aff898a..0000000 --- a/fnl/plugins/git-conflicts.fnl +++ /dev/null @@ -1,14 +0,0 @@ -;; Resolve git conflicts. - -(local keys [{1 :<leader>gi - 2 :<cmd>GitConflictListQf<cr> - :desc "Git Conflict Quick Fix"} - {1 :<leader>gg - 2 :<cmd>GitConflictRefresh<cr> - :desc "Git Conflict Refresh"}]) - -{1 :akinsho/git-conflict.nvim - :event :VeryLazy - :version "*" - :config true - : keys} |