diff options
| author | sefidel <contact@sefidel.net> | 2022-03-12 17:25:12 +0900 |
|---|---|---|
| committer | sefidel <contact@sefidel.net> | 2022-03-12 17:25:16 +0900 |
| commit | fe8f9abb94c0606a4d8845be1982fa514b4ff73a (patch) | |
| tree | a17b55b8a941037392c4954cd0b267262b097cc7 /home/profiles/research | |
| parent | 0e59c90d5eccd202cc0202da284b9a24b0e93a90 (diff) | |
| download | nixrc-fe8f9abb94c0606a4d8845be1982fa514b4ff73a.tar.gz nixrc-fe8f9abb94c0606a4d8845be1982fa514b4ff73a.zip | |
feat(home/development): use diff3 on conflict
Diffstat (limited to 'home/profiles/research')
0 files changed, 0 insertions, 0 deletions