about summary refs log tree commit diff
path: root/install
diff options
context:
space:
mode:
authorGriffin Smith <root@gws.fyi>2020-04-02T15·57-0400
committerGriffin Smith <root@gws.fyi>2020-04-02T15·57-0400
commit74ad2caf32fc35dcb6e7117c4b1b349ed7a7a545 (patch)
tree36998ad41d936dcbc871ff2eb267e2c21a4e49a1 /install
parentac2549ce500400ed7ffaefe42a1785a11b2de6fd (diff)
git merge conflictstyle diff3
why is this not the default
Diffstat (limited to 'install')
0 files changed, 0 insertions, 0 deletions