Merge conflict in .gitignore
authorArjen Baart <arjen@andromeda.nl>
Sun, 2 Feb 2020 13:40:33 +0000 (14:40 +0100)
committerArjen Baart <arjen@andromeda.nl>
Sun, 2 Feb 2020 13:40:33 +0000 (14:40 +0100)
commit4c3e2ac2996eb6f353b7a05944263a8ffae1e9f6
tree1c6f7ef49c0d9acb5bd26dfeb4169591e601388d
parent2851c2b3d0672e2478e56606c1524ea8bd10937c
parent91bdbe1895225802e7ee0c29f0844329c40884e9
Merge conflict in .gitignore
.gitignore