From 41605696177b490bc025f1ed13ccf865622d6759 Mon Sep 17 00:00:00 2001 From: Trevor-Hartman Date: Thu, 31 Aug 2023 14:47:39 -0700 Subject: [PATCH 01/10] I have a dream --- .idea/.gitignore | 3 +++ .idea/WorkflowTest.iml | 9 +++++++++ .idea/misc.xml | 6 ++++++ .idea/modules.xml | 8 ++++++++ .idea/vcs.xml | 6 ++++++ README.md | 2 ++ 6 files changed, 34 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/WorkflowTest.iml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/WorkflowTest.iml b/.idea/WorkflowTest.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/WorkflowTest.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..639900d --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..5f82f9b --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index 22992af..709fd0a 100644 --- a/README.md +++ b/README.md @@ -3,3 +3,5 @@ ## Famous Quotes "Imagination is more important than knowledge." Einstein + +"I have a dream." Martin Luther King From cf769e1ab3e65a00d802fd2ef8ba74630ffdc700 Mon Sep 17 00:00:00 2001 From: ChildOfTheWildes Date: Thu, 31 Aug 2023 15:12:51 -0700 Subject: [PATCH 02/10] Added Tesla quote --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 709fd0a..dbc7446 100644 --- a/README.md +++ b/README.md @@ -5,3 +5,5 @@ "Imagination is more important than knowledge." Einstein "I have a dream." Martin Luther King + +"Anti-social behavior is a trait of intelligence in a world full of conformists." Nikola Tesla \ No newline at end of file From 05c48a8a76aa4570c8de38aa2cdb8098dc4c1fb3 Mon Sep 17 00:00:00 2001 From: Trevor-Hartman Date: Thu, 31 Aug 2023 15:09:04 -0700 Subject: [PATCH 03/10] dylan thomas quote --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index dbc7446..8f59cac 100644 --- a/README.md +++ b/README.md @@ -6,4 +6,6 @@ "I have a dream." Martin Luther King +"Do not go gentle into that good night." Dylan Thomas + "Anti-social behavior is a trait of intelligence in a world full of conformists." Nikola Tesla \ No newline at end of file From 8627fe42683473e3209aad50035bf14fb643fc63 Mon Sep 17 00:00:00 2001 From: cxrdary Date: Thu, 31 Aug 2023 15:12:02 -0700 Subject: [PATCH 04/10] Project Files --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index dbc7446..d349dfc 100644 --- a/README.md +++ b/README.md @@ -6,4 +6,8 @@ "I have a dream." Martin Luther King +"Do not go gentle into that goodnight" - Dylan Thomas + +"I think ya sent her a little bit too hard there bud" - A Drunk Candian Guy + "Anti-social behavior is a trait of intelligence in a world full of conformists." Nikola Tesla \ No newline at end of file From e1ad642851284864a843c57a60687c81883ad73a Mon Sep 17 00:00:00 2001 From: cxrdary Date: Thu, 31 Aug 2023 15:34:36 -0700 Subject: [PATCH 05/10] Project Files --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d349dfc..48ada0f 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,6 @@ "Do not go gentle into that goodnight" - Dylan Thomas -"I think ya sent her a little bit too hard there bud" - A Drunk Candian Guy +"I think ya sent her a little-bit too hard there bud" - A Drunk Canadian Guy "Anti-social behavior is a trait of intelligence in a world full of conformists." Nikola Tesla \ No newline at end of file From 53e9a742018ac3386fddce8f57213ae3d96eac5e Mon Sep 17 00:00:00 2001 From: CLNelson1993 Date: Thu, 31 Aug 2023 15:55:54 -0700 Subject: [PATCH 06/10] im lost --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1014987..fc199ef 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ "I have a dream." Martin Luther King -"Do not go gentle into that goodnight" - Dylan Thomas +"Do not go gentle into that good night." Dylan Thomas "I think ya sent her a little-bit too hard there bud" - A Drunk Canadian Guy From 92e8c63348cf21adda0ca06926e4eba5fbd069a3 Mon Sep 17 00:00:00 2001 From: CLNelson1993 Date: Thu, 31 Aug 2023 16:00:41 -0700 Subject: [PATCH 07/10] Conflict Resolution --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index fc199ef..3255cdd 100644 --- a/README.md +++ b/README.md @@ -12,4 +12,6 @@ "Do not go gentle into that good night." Dylan Thomas -"Anti-social behavior is a trait of intelligence in a world full of conformists." Nikola Tesla \ No newline at end of file +"Anti-social behavior is a trait of intelligence in a world full of conformists." Nikola Tesla + +"The only thing we have to fear is fear itself." FDR \ No newline at end of file From edf9d17f7eadb8766e7b406fde9f832344047c7c Mon Sep 17 00:00:00 2001 From: CLNelson1993 Date: Thu, 31 Aug 2023 15:22:14 -0700 Subject: [PATCH 08/10] FDR quote. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3255cdd..7158d7a 100644 --- a/README.md +++ b/README.md @@ -14,4 +14,4 @@ "Anti-social behavior is a trait of intelligence in a world full of conformists." Nikola Tesla -"The only thing we have to fear is fear itself." FDR \ No newline at end of file +"The only thing we have to fear is fear itself." Franklin D. Roosevelt \ No newline at end of file From bdea837e24065f98e746460335972158e90f4951 Mon Sep 17 00:00:00 2001 From: CLNelson1993 Date: Thu, 31 Aug 2023 16:04:11 -0700 Subject: [PATCH 09/10] Conflict Resolution 2 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7158d7a..ec144ba 100644 --- a/README.md +++ b/README.md @@ -14,4 +14,4 @@ "Anti-social behavior is a trait of intelligence in a world full of conformists." Nikola Tesla -"The only thing we have to fear is fear itself." Franklin D. Roosevelt \ No newline at end of file +"The only thing we have to fear is fear itself." Franklin D. Roosevelt From df977b4b852aa6854d404e34ee0c0e66681f4542 Mon Sep 17 00:00:00 2001 From: CLNelson1993 Date: Thu, 31 Aug 2023 16:05:08 -0700 Subject: [PATCH 10/10] Conflict Resolution 3 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ec144ba..7158d7a 100644 --- a/README.md +++ b/README.md @@ -14,4 +14,4 @@ "Anti-social behavior is a trait of intelligence in a world full of conformists." Nikola Tesla -"The only thing we have to fear is fear itself." Franklin D. Roosevelt +"The only thing we have to fear is fear itself." Franklin D. Roosevelt \ No newline at end of file