From 15c32807abefa42e500aa679eec99ba29d15e79c Mon Sep 17 00:00:00 2001
From: Grant Moyer <grantmoyer@gmail.com>
Date: Sun, 30 Jul 2017 22:42:09 -0400
Subject: [PATCH] Resolve merge conflicts

---
 second-edition/theme/index.hbs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/second-edition/theme/index.hbs b/second-edition/theme/index.hbs
index 80eeefa68..925d5c161 100644
--- a/second-edition/theme/index.hbs
+++ b/second-edition/theme/index.hbs
@@ -64,6 +64,21 @@
             p.warning a {
                 color: rgb(0, 136, 204)
             }
+
+            a .hljs {
+                color: #4183c4;
+            }
+
+            .rust .content a .hljs,
+            .coal .content a .hljs,
+            .navy .content a .hljs {
+                color: #2b79a2;
+            }
+
+            a:hover .hljs {
+                text-decoration: underline;
+            }
+
             /* Styles keystrokes such as ctrl-C */
             .keystroke {
                 font-variant: small-caps;