Commit 01bed51c550a4e117e90fb97b2069766af3a3d07
Exists in
master
Simple merge, plus the addition of an extra comment line and whitespace
Showing
1 changed file
with
7 additions
and
0 deletions
Show diff stats
.gitignore
| 1 | 1 | |
| 2 | 2 | # File automatically generated by some file managers |
| 3 | 3 | .directory |
| 4 | + | |
| 4 | 5 | # Blender creates backup copies of files, which needn't be distributed |
| 5 | 6 | *.blend1 |
| 7 | + | |
| 6 | 8 | # Backup files |
| 7 | 9 | ~* |
| 8 | 10 | # Solidworks log files |
| 9 | 11 | *.log.* |
| 12 | + | |
| 10 | 13 | # Temporary files used for solidworks conversion from creo |
| 11 | 14 | *.stp |
| 15 | + | |
| 16 | +# Python caching | |
| 17 | +robots/little_john/telemetry/code/monitor/__pycache__/ | |
| 18 | + | ... | ... |