add course to main nav

csetarun · Dec 7, 2017 · d5035ac · d5035ac
1 parent 0578016
commit d5035ac
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/index.html b/index.html
@@ -28,6 +28,11 @@
     image: images/red-polo.png
     imageAlt: The 'red polo' octocat, a cartoon of an octocat wearing a red polo
     link: /windows
+  - title: Managing Merge Conflicts
+  description: First you had issues, now you have conflicts. Learn how to resolve at least one of them.
+  image: ./images/skatetocat.png
+  imageAlt: The 'skatetocat', a cartoon of an octocat using a skateboard and having fun
+  link: /merge-conflicts      
   - title: Git Out of Trouble
     description: Quick guides to git out of sticky situations.
     image: images/about/inspectocat.jpg