fix merge conflict

This commit is contained in:
Alexander Navarro 2024-09-14 18:20:08 -03:00
parent dc0260c20c
commit fadaa837fb
538 changed files with 6 additions and 20498 deletions

View file

@ -1,2 +1,5 @@
**/original_*
.config/lazygit/state.yml
config/tmux/plugins/*
!config/tmux/plugins/.gitkeep