summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-11-22 10:28:33 +0100
committerRemi Collet <remi@remirepo.net>2018-11-22 10:28:33 +0100
commitcba50b679ef93ae33acd2c5870b753532c6f814d (patch)
treee0e3225c8f20fcc5fbf7b49143bbab6c2d16632d /.gitignore
parent7bafaebdc9c075c3ec60b13d556b4ee1dbbfcc60 (diff)
fix conflicts
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions