about summary refs log tree commit diff
path: root/java/Main.java
AgeCommit message (Collapse)AuthorFilesLines
2020-01-29 Splice ./universe directory into ./William Carroll1-0/+6
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.