amd/dotfiles
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

fixing merge issues

Browse source
This commit is contained in:
Andrew Davidson 2024-10-11 07:28:05 -07:00
parent b174126447
commit 52058e7caa
Signed by: amd
SSH key fingerprint: SHA256:6jDSUhitcXG0Nrh/g8Gy8ZJdsZ5LzPJlaGmGKUGfP5k
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -3,8 +3,5 @@
vim/.vim/plugged vim/.vim/plugged
vim/.vim/autoload vim/.vim/autoload
zsh/.zsh/cache zsh/.zsh/cache
<<<<<<< HEAD
.DS_Store .DS_Store
=======
gnupg gnupg
>>>>>>> origin/main