Resolve merge conflicts

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;