fix merge conflict
This commit is contained in:
parent
dc0260c20c
commit
fadaa837fb
538 changed files with 6 additions and 20498 deletions
|
|
@ -1,2 +1,5 @@
|
|||
**/original_*
|
||||
.config/lazygit/state.yml
|
||||
|
||||
config/tmux/plugins/*
|
||||
!config/tmux/plugins/.gitkeep
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue