mirror of
https://github.com/davidallendj/magellan.git
synced 2025-12-20 11:37:01 -07:00
.gitignore: Delete rebase delineators
This commit is contained in:
parent
38da4a20ba
commit
6212114948
1 changed files with 0 additions and 3 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -1,11 +1,8 @@
|
||||||
magellan
|
magellan
|
||||||
emulator/rf-emulator
|
emulator/rf-emulator
|
||||||
**/*.db
|
**/*.db
|
||||||
<<<<<<< HEAD
|
|
||||||
**.tar.gz
|
**.tar.gz
|
||||||
**.tar.zst
|
**.tar.zst
|
||||||
**.part
|
**.part
|
||||||
=======
|
|
||||||
dist/*
|
dist/*
|
||||||
**coverage.out**
|
**coverage.out**
|
||||||
>>>>>>> 4b062dd (Updated .gitignore)
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue