summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-08-26 11:17:11 -0300
committerTomás Touceda <chiiph@leap.se>2013-08-26 11:17:11 -0300
commit35b7ff46d94146a2389c2185ccf355e2d0b427c0 (patch)
tree515bf8d7de0d41704e156ab4ff3f468c6a74c2df
parent2f6ad4211ccee12b577f78ff84a6d1d36d95b724 (diff)
parente651ac5a2425ee24f293285958b383dbd2ad626e (diff)
Merge remote-tracking branch 'kali/add-to-gitignore' into develop
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index b0f9a137..18bfcd69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@
ui_*.py
!.coveragerc
!.tx
+!.gitattributes
bin/
build/
core