Skip to content

Commit 0578016

Browse files
committed
exercise 3 stuff
1 parent f51d3e7 commit 0578016

File tree

3 files changed

+1
-1
lines changed

3 files changed

+1
-1
lines changed
-4.64 MB
Binary file not shown.
Loading

paths/merge-conflict/06-ex-03.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ sidebar:
1111
main-content: |
1212
So, our resume is slowly taking shape, after modifying the contact information in the `_config.yml` file, we turned our attention to the `experience.yml` file. To wrap up, we need to finish adding our education and interests to the resume.
1313
14-
[![instructions for this activity](../../images/gifs/merge-conflict/int-merge.gif)](../../images/gifs/merge-conflict/int-merge.gif)
14+
[![instructions for this activity](../../images/gifs/merge-conflict/username-education.gif)](../../images/gifs/merge-conflict/username-education.gif)
1515
1616
1. In your imported version of the repository, checkout to the branch named: `username-education`.
1717
1. While on that branch, open the `_data/education.yml` file.

0 commit comments

Comments
 (0)