summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authoraktersnurra <gustaf.rydholm@gmail.com>2020-11-22 16:20:48 +0100
committeraktersnurra <gustaf.rydholm@gmail.com>2020-11-22 16:20:48 +0100
commit8e3985c9cde6666e4314973312135ec1c7a025b9 (patch)
treef2a360bf92693bf8c03d81d1337441b3ef5fe8d8 /.gitignore
parent527bb98b191d82b308de1585047e06056258d08d (diff)
parent73ae250d7993fa48eccff4042ecd6bf768650bf3 (diff)
fixing conflict
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions