diff options
| author | st33v <github@f3rr3t.com> | 2017-01-14 19:18:13 +1100 |
|---|---|---|
| committer | st33v <github@f3rr3t.com> | 2017-01-14 19:18:13 +1100 |
| commit | 851f3b8ff25a919fe745a1fede3a8b321e1b93be (patch) | |
| tree | 763f33a603cf41966d12321221908a3c9178deef /.gitignore | |
| parent | d38ede7bb09f15ab87447ff3fc45a30645013b69 (diff) | |
| parent | 56e2fcd409e6e6f2375f591ec2c8ba866dd355bc (diff) | |
Merge branch 'master' of github.com:f3rr3t/raspi-takepix
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -1,4 +1,8 @@ # Don't track image files, which are created by the takepix script. *.jpg *.config +<<<<<<< HEAD bump* +======= +bump.txt +>>>>>>> 56e2fcd409e6e6f2375f591ec2c8ba866dd355bc |