Ethan 9addee2a9f Merge remote-tracking branch 'origin/master' ... # Conflicts: # .idea/misc.xml # .idea/vcs.xml		2020-07-25 03:04:24 -04:00
..
libraries	!This is a test commit.	2020-07-25 01:17:16 -04:00
compiler.xml	!This is a test commit.	2020-07-25 01:17:16 -04:00
encodings.xml	!This is a test commit.	2020-07-25 01:17:16 -04:00
misc.xml	!I am only doing this because it's making me.	2020-07-25 03:04:07 -04:00
modules.xml	!I am only doing this because it's making me.	2020-07-25 03:04:07 -04:00
vcs.xml	!I am only doing this because it's making me.	2020-07-25 03:04:07 -04:00
workspace.xml	!I am only doing this because it's making me.	2020-07-25 03:04:07 -04:00