exercise 2 gif

csetarun · Dec 7, 2017 · 7f59d58 · 7f59d58
1 parent 1bee502
commit 7f59d58
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/images/gifs/merge-conflict/username-experience.gif b/images/gifs/merge-conflict/username-experience.gif
diff --git a/paths/merge-conflict/05-ex-02.md b/paths/merge-conflict/05-ex-02.md
@@ -12,11 +12,14 @@ main-content: |
 
   Since we customized the resume to include our information, we should include our current professional experience. To include our experience we need to modify the `experience.yml` file.
 
-  [![instructions for this activity](../../images/gifs/merge-conflict/exp-merge.gif)](../../images/gifs/merge-conflict/exp-merge.gif)
+  [![instructions for this activity](../../images/gifs/merge-conflict/username-experience.gif)](../../images/gifs/merge-conflict/username-experience.gif)
 
   1. In your imported version of the repository, checkout to the branch named: `username-experience`.
   1. While on that branch, open the `_data/experience.yml` file.
-  1. Modify on the content on lines 2 through 6 making sure to provide information in the `company`, `position`, `duration`, and `summary` lines.
+  1. Modify the content on lines 2 through 6 and 15 through 19 making sure to provide information in the `company`, `position`, `duration`, and `summary` lines.
+   
+        > Later you can go back and modify the `experience.yml` to be consistent with your experience. 
+
   1. After making the changes, create a commit, an example commit message might be: `Add my experience`.
 
         > If you made the changes on your local machine, push your changes back to repository on GitHub.