resolve merge conflicts

1 files changed, 0 insertions, 245 deletions

diff --git a/sass/syntax/syntax-dracula-abridge-dark.scss b/sass/syntax/syntax-dracula-abridge-dark.scss
deleted file mode 100644
index f5fc9c4..0000000
--- a/sass/syntax/syntax-dracula-abridge-dark.scss
+++ /dev/null
@@ -1,245 +0,0 @@
-.z-code {
- color: #f8f8f2;
- background-color: #191919;
-}
-.z-comment {
- color: #7080b3;
-}
-.z-string {
- color: #f1fa8c;
-}
-.z-constant.z-numeric {
- color: #bd93f9;
-}
-.z-constant.z-language {
- color: #bd93f9;
-}
-.z-constant.z-character, .z-constant.z-other {
- color: #bd93f9;
-}
-.z-variable {
-}
-.z-variable.z-other.z-readwrite.z-instance {
- color: #ffb86c;
-}
-.z-constant.z-character.z-escaped, .z-constant.z-character.z-escape, .z-string .z-source, .z-string .z-source.z-ruby {
- color: #ff79c6;
-}
-.z-source.z-ruby .z-string.z-regexp.z-classic.z-ruby, .z-source.z-ruby .z-string.z-regexp.z-mod-r.z-ruby {
- color: #ff7d78;
-}
-.z-keyword {
- color: #ff79c6;
-}
-.z-storage {
- color: #ff79c6;
-}
-.z-storage.z-type {
- color: #8be9fd;
- font-style: italic;
-}
-.z-storage.z-type.z-namespace {
- color: #8be9fd;
- font-style: italic;
-}
-.z-storage.z-type.z-class {
- color: #ff79c6;
- font-style: italic;
-}
-.z-entity.z-name.z-class {
- color: #8be9fd;
- text-decoration: underline;
-}
-.z-meta.z-path {
- color: #66d9ef;
- text-decoration: underline;
-}
-.z-entity.z-other.z-inherited-class {
- color: #8be9fd;
- text-decoration: underline;
- font-style: italic;
-}
-.z-entity.z-name.z-function {
- color: #50fa7b;
-}
-.z-variable.z-parameter {
- color: #ffb86c;
- font-style: italic;
-}
-.z-entity.z-name.z-tag {
- color: #ff79c6;
-}
-.z-entity.z-other.z-attribute-name {
- color: #50fa7b;
-}
-.z-support.z-function {
- color: #8be9fd;
-}
-.z-support.z-constant {
- color: #6be5fd;
-}
-.z-support.z-type, .z-support.z-class {
- color: #66d9ef;
- font-style: italic;
-}
-.z-support.z-other.z-variable {
-}
-.z-support.z-other.z-namespace {
- color: #66d9ef;
- font-style: italic;
-}
-.z-invalid {
- color: #f8f8f0;
- background-color: #ff79c6;
-}
-.z-invalid.z-deprecated {
- color: #f8f8f0;
- background-color: #bd93f9;
-}
-.z-meta.z-structure.z-dictionary.z-json .z-string.z-quoted.z-double.z-json {
- color: #cfcfc2;
-}
-.z-meta.z-diff, .z-meta.z-diff.z-header {
- color: #7080b3;
-}
-.z-markup.z-deleted {
- color: #ff79c6;
-}
-.z-markup.z-inserted {
- color: #50fa7b;
-}
-.z-markup.z-changed {
- color: #e6db74;
-}
-.z-constant.z-numeric.z-line-number.z-find-in-files {
- color: #bd93f9;
-}
-.z-entity.z-name.z-filename {
- color: #e6db74;
-}
-.z-message.z-error {
- color: #ff7c6d;
-}
-.z-punctuation.z-definition.z-string.z-begin.z-json, .z-punctuation.z-definition.z-string.z-end.z-json {
- color: #eeeeee;
-}
-.z-meta.z-structure.z-dictionary.z-json .z-string.z-quoted.z-double.z-json {
- color: #8be9fd;
-}
-.z-meta.z-structure.z-dictionary.z-value.z-json .z-string.z-quoted.z-double.z-json {
- color: #f1fa8c;
-}
-.z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta.z-structure.z-dictionary.z-value .z-string {
- color: #50fa7b;
-}
-.z-meta .z-meta .z-meta .z-meta .z-meta .z-meta.z-structure.z-dictionary.z-value .z-string {
- color: #ffb86c;
-}
-.z-meta .z-meta .z-meta .z-meta .z-meta.z-structure.z-dictionary.z-value .z-string {
- color: #ff79c6;
-}
-.z-meta .z-meta .z-meta .z-meta.z-structure.z-dictionary.z-value .z-string {
- color: #bd93f9;
-}
-.z-meta .z-meta .z-meta.z-structure.z-dictionary.z-value .z-string {
- color: #50fa7b;
-}
-.z-meta .z-meta.z-structure.z-dictionary.z-value .z-string {
- color: #ffb86c;
-}
-.z-markup.z-strike {
- color: #ffb86c;
- font-style: italic;
-}
-.z-markup.z-bold {
- color: #ffb86c;
-font-weight: bold;
-}
-.z-markup.z-italic {
- color: #ffb86c;
- font-style: italic;
-}
-.z-markup.z-heading {
- color: #8be9fd;
-}
-.z-punctuation.z-definition.z-list_item.z-markdown {
- color: #ff79c6;
-}
-.z-markup.z-quote {
- color: #7080b3;
- font-style: italic;
-}
-.z-punctuation.z-definition.z-blockquote.z-markdown {
- color: #7080b3;
- background-color: #7080b3;
- font-style: italic;
-}
-.z-meta.z-separator {
- color: #7080b3;
-}
-.z-text.z-html.z-markdown .z-markup.z-raw.z-inline {
- color: #50fa7b;
-}
-.z-markup.z-underline {
- color: #bd93f9;
- text-decoration: underline;
-}
-.z-markup.z-raw.z-block {
- color: #cfcfc2;
-}
-.z-markup.z-raw.z-block.z-fenced.z-markdown .z-source {
- color: #f8f8f2;
-}
-.z-punctuation.z-definition.z-fenced.z-markdown, .z-variable.z-language.z-fenced.z-markdown {
- color: #7080b3;
- font-style: italic;
-}
-.z-variable.z-language.z-fenced.z-markdown {
- color: #7080b3;
- font-style: italic;
-}
-.z-punctuation.z-accessor {
- color: #ff79c6;
-}
-.z-meta.z-function.z-return-type {
- color: #ff79c6;
-}
-.z-punctuation.z-section.z-block.z-begin {
- color: #ffffff;
-}
-.z-punctuation.z-section.z-block.z-end {
- color: #ffffff;
-}
-.z-punctuation.z-section.z-embedded.z-begin {
- color: #ff79c6;
-}
-.z-punctuation.z-section.z-embedded.z-end {
- color: #ff79c6;
-}
-.z-punctuation.z-separator.z-namespace {
- color: #ff79c6;
-}
-.z-variable.z-function {
- color: #50fa7b;
-}
-.z-variable.z-other {
- color: #ffffff;
-}
-.z-variable.z-language {
- color: #bd93f9;
-}
-.z-entity.z-name.z-module.z-ruby {
- color: #8be9fd;
-}
-.z-entity.z-name.z-constant.z-ruby {
- color: #bd93f9;
-}
-.z-support.z-function.z-builtin.z-ruby {
- color: #ffffff;
-}
-.z-storage.z-type.z-namespace.z-cs {
- color: #ff79c6;
-}
-.z-entity.z-name.z-namespace.z-cs {
- color: #8be9fd;
-}