From 5c9079a41059e077f2b71b68eb83ff9fcb2e38d1 Mon Sep 17 00:00:00 2001 From: William Carroll Date: Wed, 29 Jan 2020 14:43:20 +0000 Subject: 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. --- data_structures_and_algorithms/test.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 data_structures_and_algorithms/test.txt (limited to 'data_structures_and_algorithms/test.txt') diff --git a/data_structures_and_algorithms/test.txt b/data_structures_and_algorithms/test.txt new file mode 100644 index 000000000000..ce013625030b --- /dev/null +++ b/data_structures_and_algorithms/test.txt @@ -0,0 +1 @@ +hello -- cgit 1.4.1