.dotfiles/nvim.bk
John Mertz 914a95d622 Merge branch 'master' of ssh://git@git.john.me.tz:223/jpm/.dotfiles.git
Conflicts:
	bash/bashrc.host
	sway/autostart
2023-07-16 14:46:10 -04:00
..
lua Merge branch 'master' of ssh://git@git.john.me.tz:223/jpm/.dotfiles.git 2023-07-16 14:46:10 -04:00
pack/packer/start/packer.nvim Merge branch 'master' of ssh://git@git.john.me.tz:223/jpm/.dotfiles.git 2023-07-16 14:46:10 -04:00
plugin Merge branch 'master' of ssh://git@git.john.me.tz:223/jpm/.dotfiles.git 2023-07-16 14:46:10 -04:00
shada Merge branch 'master' of ssh://git@git.john.me.tz:223/jpm/.dotfiles.git 2023-07-16 14:46:10 -04:00
swap Merge branch 'master' of ssh://git@git.john.me.tz:223/jpm/.dotfiles.git 2023-07-16 14:46:10 -04:00
init.lua Merge branch 'master' of ssh://git@git.john.me.tz:223/jpm/.dotfiles.git 2023-07-16 14:46:10 -04:00
init.vim.old Merge branch 'master' of ssh://git@git.john.me.tz:223/jpm/.dotfiles.git 2023-07-16 14:46:10 -04:00