diff options
| author | Micah Anderson <micah@riseup.net> | 2015-11-10 19:54:29 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2015-11-10 19:54:29 -0500 |
| commit | 1e7cd201e589d4b0668af1dccab316053d943448 (patch) | |
| tree | 9424c43f04794e0dff47cbd048fcd5f78f707c76 /.gitignore | |
| parent | 93ac9288e301643a4b9c31e2750a231f4e7bc8d8 (diff) | |
missed one merge conflict fix
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions