summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorGustaf Rydholm <gustaf.rydholm@gmail.com>2023-09-22 23:58:52 +0200
committerGustaf Rydholm <gustaf.rydholm@gmail.com>2023-09-22 23:58:52 +0200
commitcc8adce9d8a7dd63bc639b3e2d3e71d82ee1713f (patch)
treecd77460de3a22c37bf31b072b1e7490fb341965b /.gitignore
parentdb5bc4eacc3f8283b9de42df688dc12149358d96 (diff)
Add git-conflicts
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions