diff options
| author | Gustaf Rydholm <gustaf.rydholm@gmail.com> | 2025-01-23 23:43:59 +0100 |
|---|---|---|
| committer | Gustaf Rydholm <gustaf.rydholm@gmail.com> | 2025-01-23 23:43:59 +0100 |
| commit | 5234ea22cb11eece78f69dd7a79a3086c90e898a (patch) | |
| tree | 41d338299b49b8995e47c0e1066d2a6e9ea964cc /fnl | |
| parent | 23963beb694333a65b86ca011508e84aef3095dc (diff) | |
Remove git conflict
Diffstat (limited to 'fnl')
| -rw-r--r-- | fnl/plugins/git-conflict.fnl | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/fnl/plugins/git-conflict.fnl b/fnl/plugins/git-conflict.fnl deleted file mode 100644 index df3285e..0000000 --- a/fnl/plugins/git-conflict.fnl +++ /dev/null @@ -1,13 +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 - :version "*" - :config true - : keys} |