Update gruvbox-muted-theme-blue.yaml

2021-12-29 19:51:51 -05:00
parent aa9fc20b8b 2788f466b6
commit 6f851a2f39
6 changed files with 209 additions and 101 deletions
--- a/extensions/gruvbox-muted-theme-blue.yaml
+++ b/extensions/gruvbox-muted-theme-blue.yaml
@@ -1,6 +1,14 @@
 ---
+<<<<<<< HEAD
 id: io.github.xthursdayx.sn-gruvbox-muted-theme-blue
 github: xthursdayx/sn-gruvbox-muted-theme
+||||||| a44c07e
+id: io.github.bithooks.sn-gruvbox-muted-theme-blue
+github: bithooks/sn-gruvbox-muted-theme/
+=======
+id: io.github.bithooks.sn-gruvbox-muted-theme-blue
+github: bithooks/sn-gruvbox-muted-theme
+>>>>>>> iganeshk-master
 main: blue/dist/dist.css

 name: Gruvbox Muted Theme Blue
--- a/extensions/subtle-dark-theme.yaml
+++ b/extensions/subtle-dark-theme.yaml
@@ -3,7 +3,7 @@ id: tech.gunderson.sn-theme-subtle-dark
 github: Parkertg/sn-theme-subtle-dark
 main: dist/dist.css

-name: Subtle Light
+name: Subtle Dark
 content_type: SN|Theme
 area: themes
 version: 1.1