Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file added 538675508.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ Lastly we initiate a pull request to the origin blessed repository using the `Pu
First Conflict
--------------
Here we will help you face and resolve a git conflict by trying to simulate the situation. We have the following
sentence `She sells sea-shells on the sea-shore.`. What we will do is modify this sentence to contain `by the seashore`
sentence `She sells sea-shells at the sea-shore.`. What we will do is modify this sentence to contain `by the seashore`
as opposed to `on the sea-shore`.

#### Branch
Expand Down
Binary file added lgi01a201408151000.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.