summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2014-05-20 17:54:44 -0500
committerKali Kaneko <kali@leap.se>2014-05-20 17:54:44 -0500
commit2226688ad94133ff17654738a9bb3e02f4f528c3 (patch)
tree82a0bf6be1279e50512cbe20b04f4d65b7fdaa82 /.gitignore
parent677ad50c539fbd8e88231fa3cd158ac9f489e0fc (diff)
remove openresolv from conflicts
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions