resolve merge conflicts

1 files changed, 0 insertions, 15 deletions

diff --git a/sass/include/_hr.scss b/sass/include/_hr.scss
deleted file mode 100644
index 98e536e..0000000
--- a/sass/include/_hr.scss
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * HR
- * https://github.com/picocss/pico
- */
-
-// 1. Add the correct box sizing in Firefox
-// 2. Show the overflow in Edge and IE
-hr {
-  box-sizing: content-box; // 1
-  height: 0; // 1
-  overflow: visible; // 2
-  border: none;
-  border-top: 1px solid var(--f1);
-}
-header hr, footer hr {border-top: 1px solid var(--c4)}