Skip to content

Conflict merge #164

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
wants to merge 10 commits into
base: conflict-merge
Choose a base branch
from
Open

Conflict merge #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
075fb14
Remove this meta info from The Road Not Taken Poem
ronlum Sep 15, 2018
3e2511a
Add a file, paranoid!
pitrafa Apr 24, 2023
2ee99fe
Update conflict_lesson.txt
chalmerlowe Apr 24, 2023
0a0ed5f
Merge pull request #119 from ronlum/patch-1
chalmerlowe Apr 24, 2023
15e3abf
Merge branch 'chalmerlowe:main' into main
pitrafa Oct 1, 2023
ba2583f
Update conflict_lesson.txt
pitrafa Oct 2, 2023
159087f
Update conflict_lesson.txt
pitrafa Oct 2, 2023
b153e51
Update conflict_lesson.txt
pitrafa Oct 2, 2023
c482ceb
Adds minor edit
pitrafa Oct 2, 2023
64591ab
Removes merge conflicts
pitrafa Oct 2, 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
2 changes: 1 addition & 1 deletion conflict_lesson.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
DO NOT EDIT THIS FILE (yet). A
DO NOT EDIT THIS FILE (yet). Chalmer left stuff. That bad. B
This file is for use later in the "Intro to Sprinting" lesson.
You will be told when to edit this file.
IF you opened it by accident, simply close it, do not save any changes in it, etc, until told to do so.
Expand Down
1 change: 1 addition & 0 deletions i_am_ironman.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Let's rock!
3 changes: 1 addition & 2 deletions the_road_not_taken.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
The Road Not Taken Related Poem Content Details
BY ROBERT FROST
Audio Player
00:0001:16Use Up/Down Arrow keys to increase or decrease volume.

Two roads diverged in a yellow wood,
And sorry I could not travel both
And be one traveler, long I stood
Expand Down