resolve merge conflicts

1 files changed, 0 insertions, 33 deletions

diff --git a/sass/include/_code.scss b/sass/include/_code.scss
deleted file mode 100644
index fd9eb97..0000000
--- a/sass/include/_code.scss
+++ /dev/null
@@ -1,33 +0,0 @@
-// Code
-pre,
-code,
-kbd,
-samp,
-tt,
-var {
-  border-radius: var(--br);
-  background: var(--c2);
-  font-family: var(--fm);
-  line-height: initial;
-  font-size: .8rem;
-  padding: .3rem .2rem;
-}
-pre {
-  display: block;
-  overflow-x: auto;
-  -ms-overflow-style: scrollbar;
-  white-space: pre;
-  > code {
-    display: block;
-    background: transparent;
-  }
-}
-
-// kbd
-kbd {
-  background-color: var(--f2);
-  color: var(--c1);
-  vertical-align: baseline;
-  font-size: 1rem;
-  padding: .2rem;
-}