.DS_Store
.idea
*.log
tmp/

<<<<<<< HEAD
<<<<<<< HEAD
=======

>>>>>>> 6231dc6 (Add gitignore)
=======

=======
>>>>>>> 8ac4896 (Update)
>>>>>>> 70fd802 (Update)
custom.el