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 | # File automatically generated by some file managers | 2 | # File automatically generated by some file managers |
| 3 | .directory | 3 | .directory |
| 4 | + | ||
| 4 | # Blender creates backup copies of files, which needn't be distributed | 5 | # Blender creates backup copies of files, which needn't be distributed |
| 5 | *.blend1 | 6 | *.blend1 |
| 7 | + | ||
| 6 | # Backup files | 8 | # Backup files |
| 7 | ~* | 9 | ~* |
| 8 | # Solidworks log files | 10 | # Solidworks log files |
| 9 | *.log.* | 11 | *.log.* |
| 12 | + | ||
| 10 | # Temporary files used for solidworks conversion from creo | 13 | # Temporary files used for solidworks conversion from creo |
| 11 | *.stp | 14 | *.stp |
| 15 | + | ||
| 16 | +# Python caching | ||
| 17 | +robots/little_john/telemetry/code/monitor/__pycache__/ | ||
| 18 | + |