diff options
author | William Carroll <wpcarro@gmail.com> | 2020-01-29T14·43+0000 |
---|---|---|
committer | William Carroll <wpcarro@gmail.com> | 2020-01-29T14·43+0000 |
commit | 5c9079a41059e077f2b71b68eb83ff9fcb2e38d1 (patch) | |
tree | dce7e3566b04213228fb3c92fc593ca18841d972 /.gitignore | |
parent | fb9380ba268b3cd27372acadb87b14cc96163374 (diff) |
Splice ./universe directory into ./
Manually merging: - README.md: I added the description from universe/README.md into the heading of dotfiles/README.md. - .envrc: dotfiles/.envrc was a superset of universe/.envrc - .gitignore: Adding some of the ignored patterns from universe/.gitignore to dotfiles/.gitignore Everything else here should be a simple rename.
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index e201d3ac43ab..83bf215fa9b4 100644 --- a/.gitignore +++ b/.gitignore @@ -17,5 +17,12 @@ Vundle.vim **/*/.emacs.d/custom.el **/*/.emacs.d/projectile-bookmarks.eld **/*/.emacs.d/bookmarks -__pycache__/ **/*/transient/history.el + +# Haskell +*.hi +*.o + +# Python +__pycache__ +*.class \ No newline at end of file |