about summary refs log tree commit diff
path: root/lib
diff options
context:
space:
mode:
authorsefidel <contact@sefidel.net>2022-03-17 17:30:31 +0900
committersefidel <contact@sefidel.net>2022-03-17 17:30:31 +0900
commitae06102731e2c7add93f02a4a93b2cbf57250ac7 (patch)
tree23eed44f777b94f4bcb9d12428bafbd01392ec0b /lib
parente65cda9d014d6197300a5e37093c4fdcc5bae09c (diff)
downloadnixrc-ae06102731e2c7add93f02a4a93b2cbf57250ac7.tar.gz
nixrc-ae06102731e2c7add93f02a4a93b2cbf57250ac7.zip
Revert "feat(home/development): use diff3 on conflict"
This reverts commit af2fa4a9d6ed7204a1f253c6ad6fc695f9a121f0.
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions