diff options
| author | a01200356 <a01200356@itesm.mx> | 2016-01-10 19:29:05 -0600 |
|---|---|---|
| committer | a01200356 <a01200356@itesm.mx> | 2016-01-10 19:29:05 -0600 |
| commit | 4130b3dfd640d4e4f88937e79648cfe7929dca43 (patch) | |
| tree | baeb2d7460e23f42d5899ca91fa45daf8f825771 /.gitignore | |
| parent | 3bbdb23fd86a65d9c982aa34ee42326fa3dd9bc1 (diff) | |
| parent | 6a158ca2d2c5fdec597f1025c58fad90a57312dc (diff) | |
Merge branch 'master' of https://github.com/asciimoo/searx
Conflicts:
searx/tests/test_engines.py
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/.gitignore b/.gitignore index 760b1a8f3..105f0191b 100644 --- a/.gitignore +++ b/.gitignore @@ -5,24 +5,13 @@ env robot_log.html robot_output.xml robot_report.html +test_basic/ setup.cfg *.pyc */*.pyc *~ -bin/ -build/ -coverage/ -develop-eggs/ -dist/ -eggs/ -include/ -lib/ -local/ -parts/ -searx.egg-info/ -var/ node_modules/ .tx/ |