diff options
author | Yaroslav de la Peña Smirnov <yps@yaroslavps.com> | 2022-08-22 06:46:27 +0300 |
---|---|---|
committer | Yaroslav de la Peña Smirnov <yps@yaroslavps.com> | 2022-08-22 06:46:27 +0300 |
commit | cdb34dc6279b0227f407e042770ffed70a2a51c4 (patch) | |
tree | 62a0b2c781998e75649c5461be9b209dc6d9f814 /dotfiles/.gnupg/gpg-agent.conf | |
parent | f70ecf81c9fd64e85fe1bfb5ebc32e9c69ec9e39 (diff) | |
download | swayrice-cdb34dc6279b0227f407e042770ffed70a2a51c4.tar.gz swayrice-cdb34dc6279b0227f407e042770ffed70a2a51c4.zip |
diffconflicts script for saner git merges in vim
Diffstat (limited to 'dotfiles/.gnupg/gpg-agent.conf')
0 files changed, 0 insertions, 0 deletions