exercise 3 stuff

benbroadaway · Dec 7, 2017 · 0578016 · 0578016
1 parent f51d3e7
commit 0578016
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 1 deletion.
diff --git a/images/gifs/merge-conflict/int-merge.gif b/images/gifs/merge-conflict/int-merge.gif
diff --git a/images/gifs/merge-conflict/username-education.gif b/images/gifs/merge-conflict/username-education.gif
diff --git a/paths/merge-conflict/06-ex-03.md b/paths/merge-conflict/06-ex-03.md
@@ -11,7 +11,7 @@ sidebar:
 main-content: |
   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.
 
-  [![instructions for this activity](../../images/gifs/merge-conflict/int-merge.gif)](../../images/gifs/merge-conflict/int-merge.gif)
+  [![instructions for this activity](../../images/gifs/merge-conflict/username-education.gif)](../../images/gifs/merge-conflict/username-education.gif)
 
   1. In your imported version of the repository, checkout to the branch named: `username-education`.
   1. While on that branch, open the `_data/education.yml` file.