.DS_Store .idea *.log tmp/ <<<<<<< HEAD ======= >>>>>>> 6231dc6 (Add gitignore) custom.el