Remove git merge artifacts from gitignore (#9)

This commit is contained in:
Ben Woodward 2023-08-23 00:14:57 +01:00 committed by GitHub
parent 147ef2cbea
commit 5ed46c315e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

4
.gitignore vendored
View File

@ -1,8 +1,4 @@
coverage.txt
<<<<<<< HEAD
dist/
=======
_examples/catppuccin
_examples/frames/
>>>>>>> 448501b (feat: documentation, better examples)