.gitignore: Delete rebase delineators

This commit is contained in:
Devon Bautista 2024-09-26 10:53:58 -06:00
parent 38da4a20ba
commit 6212114948
No known key found for this signature in database
GPG key ID: E1AAD3D4444A3DA0

3
.gitignore vendored
View file

@ -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)