Skip to content

Feature chris #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CLNelson1993 wants to merge 13 commits into
base: main
Choose a base branch
from
Open

Feature chris #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
4160569
I have a dream
THartmanOfTheRedwoods Aug 31, 2023
cf769e1
Added Tesla quote
ChildOfTheWildes Aug 31, 2023
d8217de
Merge pull request #3 from ChildOfTheWildes/featureJgrimm
THartmanOfTheRedwoods Aug 31, 2023
05c48a8
dylan thomas quote
THartmanOfTheRedwoods Aug 31, 2023
8627fe4
Project Files
Cxrdary Aug 31, 2023
e1ad642
Project Files
Cxrdary Aug 31, 2023
eef2a90
Merge branch 'dev' into feature778
THartmanOfTheRedwoods Aug 31, 2023
d297213
Merge pull request #6 from Cxrdary/feature778
THartmanOfTheRedwoods Aug 31, 2023
53e9a74
im lost
CLNelson1993 Aug 31, 2023
92e8c63
Conflict Resolution
CLNelson1993 Aug 31, 2023
edf9d17
FDR quote.
CLNelson1993 Aug 31, 2023
bdea837
Conflict Resolution 2
CLNelson1993 Aug 31, 2023
df977b4
Conflict Resolution 3
CLNelson1993 Aug 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .idea/.gitignore
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/WorkflowTest.iml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,15 @@
## Famous Quotes

"Imagination is more important than knowledge." Einstein

"I have a dream." Martin Luther King

"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

"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

"The only thing we have to fear is fear itself." Franklin D. Roosevelt