From 5c9079a41059e077f2b71b68eb83ff9fcb2e38d1 Mon Sep 17 00:00:00 2001
From: William Carroll <wpcarro@gmail.com>
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.
---
 java/Another.java | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 java/Another.java

(limited to 'java/Another.java')

diff --git a/java/Another.java b/java/Another.java
new file mode 100644
index 000000000000..e431e157336b
--- /dev/null
+++ b/java/Another.java
@@ -0,0 +1,5 @@
+public class Another {
+  public static String whatis() {
+    return "Testing";
+  }
+}
-- 
cgit 1.4.1