diff options
| author | Alessio Sergi <al3hex@gmail.com> | 2014-06-14 12:44:24 +0200 |
|---|---|---|
| committer | Alessio Sergi <al3hex@gmail.com> | 2014-06-14 12:52:26 +0200 |
| commit | c29ddd58bf64fc81abe18ebcd2bbaf12c0e61ef5 (patch) | |
| tree | c9370af4e72c566093c915298057b641b0628620 /.gitignore | |
| parent | 09bdb9de74281553bca86fc0746493ad1987d1ce (diff) | |
Fix leftovers from merge conflict
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -38,8 +38,5 @@ local.properties # ctags .tags* -# Lang -glances.pot - # Sphinx _build |