Skip to content

Commit 4166c9e

Browse files
authored
fix(data): fix conflict data (#258)
1 parent 7eccdda commit 4166c9e

File tree

9 files changed

+794
-574
lines changed

9 files changed

+794
-574
lines changed

COLORSCHEMES.md

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11

2-
ColorSchemes List (60)
2+
ColorSchemes List (58)
33
======================
44

5-
- [morhetz/gruvbox](https://github.com/morhetz/gruvbox) (stars: 14237, last update: 2023-08-14)
6-
- gruvbox
7-
- [folke/tokyonight.nvim](https://github.com/folke/tokyonight.nvim) (stars: 6800, last update: 2025-02-18)
5+
- [folke/tokyonight.nvim](https://github.com/folke/tokyonight.nvim) (stars: 6800, last update: 2025-02-19)
86
- tokyonight
97
- tokyonight-day
108
- tokyonight-moon
119
- tokyonight-night
1210
- tokyonight-storm
13-
- [catppuccin/nvim](https://github.com/catppuccin/nvim) (stars: 6100, last update: 2025-02-28)
11+
- [catppuccin/nvim](https://github.com/catppuccin/nvim) (stars: 6100, last update: 2025-03-01)
1412
- catppuccin
1513
- catppuccin-frappe
1614
- catppuccin-latte
@@ -21,11 +19,9 @@ ColorSchemes List (60)
2119
- kanagawa-dragon
2220
- kanagawa-lotus
2321
- kanagawa-wave
24-
- [joshdick/onedark.vim](https://github.com/joshdick/onedark.vim) (stars: 3927, last update: 2024-07-16)
25-
- onedark
2622
- [tomasr/molokai](https://github.com/tomasr/molokai) (stars: 3617, last update: 2015-11-11)
2723
- molokai
28-
- [edeneast/nightfox.nvim](https://github.com/edeneast/nightfox.nvim) (stars: 3400, last update: 2025-02-09)
24+
- [edeneast/nightfox.nvim](https://github.com/edeneast/nightfox.nvim) (stars: 3400, last update: 2025-02-10)
2925
- carbonfox
3026
- dawnfox
3127
- dayfox
@@ -58,17 +54,17 @@ ColorSchemes List (60)
5854
- github_light_tritanopia
5955
- [sainnhe/gruvbox-material](https://github.com/sainnhe/gruvbox-material) (stars: 2100, last update: 2025-02-24)
6056
- gruvbox-material
61-
- [ellisonleao/gruvbox.nvim](https://github.com/ellisonleao/gruvbox.nvim) (stars: 2100, last update: 2025-03-05)
57+
- [ellisonleao/gruvbox.nvim](https://github.com/ellisonleao/gruvbox.nvim) (stars: 2100, last update: 2025-03-06)
6258
- gruvbox
63-
- [rakr/vim-one](https://github.com/rakr/vim-one) (stars: 2008, last update: 2020-12-14)
59+
- [rakr/vim-one](https://github.com/rakr/vim-one) (stars: 2008, last update: 2020-12-15)
6460
- one
65-
- [nanotech/jellybeans.vim](https://github.com/nanotech/jellybeans.vim) (stars: 1821, last update: 2019-06-21)
61+
- [nanotech/jellybeans.vim](https://github.com/nanotech/jellybeans.vim) (stars: 1821, last update: 2019-06-22)
6662
- jellybeans
6763
- [sainnhe/sonokai](https://github.com/sainnhe/sonokai) (stars: 1800, last update: 2025-02-24)
6864
- sonokai
6965
- [ayu-theme/ayu-vim](https://github.com/ayu-theme/ayu-vim) (stars: 1732, last update: 2024-07-15)
7066
- ayu
71-
- [navarasu/onedark.nvim](https://github.com/navarasu/onedark.nvim) (stars: 1700, last update: 2024-11-09)
67+
- [navarasu/onedark.nvim](https://github.com/navarasu/onedark.nvim) (stars: 1700, last update: 2024-11-10)
7268
- onedark
7369
- [junegunn/seoul256.vim](https://github.com/junegunn/seoul256.vim) (stars: 1674, last update: 2023-05-03)
7470
- seoul256
@@ -77,45 +73,45 @@ ColorSchemes List (60)
7773
- hybrid
7874
- [ku1ik/vim-monokai](https://github.com/ku1ik/vim-monokai) (stars: 1451, last update: 2022-02-09)
7975
- monokai
80-
- [dracula/vim](https://github.com/dracula/vim) (stars: 1400, last update: 2024-07-21)
76+
- [dracula/vim](https://github.com/dracula/vim) (stars: 1400, last update: 2024-07-22)
8177
- dracula
8278
- [nyoom-engineering/oxocarbon.nvim](https://github.com/nyoom-engineering/oxocarbon.nvim) (stars: 1300, last update: 2024-08-28)
8379
- oxocarbon
84-
- [sjl/badwolf](https://github.com/sjl/badwolf) (stars: 1258, last update: 2024-05-23)
80+
- [sjl/badwolf](https://github.com/sjl/badwolf) (stars: 1258, last update: 2024-05-24)
8581
- badwolf
8682
- goodwolf
8783
- [mhartington/oceanic-next](https://github.com/mhartington/oceanic-next) (stars: 1200, last update: 2023-05-01)
8884
- OceanicNext
8985
- OceanicNextLight
9086
- [jacoborus/tender.vim](https://github.com/jacoborus/tender.vim) (stars: 1180, last update: 2025-02-28)
9187
- tender
92-
- [marko-cerovac/material.nvim](https://github.com/marko-cerovac/material.nvim) (stars: 1000, last update: 2025-03-14)
88+
- [marko-cerovac/material.nvim](https://github.com/marko-cerovac/material.nvim) (stars: 1000, last update: 2025-03-15)
9389
- material
9490
- material-darker
9591
- material-deep-ocean
9692
- material-lighter
9793
- material-oceanic
9894
- material-palenight
99-
- [tomasiser/vim-code-dark](https://github.com/tomasiser/vim-code-dark) (stars: 970, last update: 2024-05-21)
95+
- [tomasiser/vim-code-dark](https://github.com/tomasiser/vim-code-dark) (stars: 970, last update: 2024-05-22)
10096
- codedark
10197
- [bluz71/vim-moonfly-colors](https://github.com/bluz71/vim-moonfly-colors) (stars: 962, last update: 2025-03-18)
10298
- moonfly
10399
- [sainnhe/edge](https://github.com/sainnhe/edge) (stars: 937, last update: 2025-02-24)
104100
- edge
105-
- [jnurmine/zenburn](https://github.com/jnurmine/zenburn) (stars: 899, last update: 2022-08-08)
101+
- [jnurmine/zenburn](https://github.com/jnurmine/zenburn) (stars: 899, last update: 2022-08-09)
106102
- zenburn
107103
- [romainl/apprentice](https://github.com/romainl/apprentice) (stars: 898, last update: 2024-07-30)
108104
- apprentice
109105
- [shaunsingh/nord.nvim](https://github.com/shaunsingh/nord.nvim) (stars: 892, last update: 2023-12-20)
110106
- nord
111-
- [scottmckendry/cyberdream.nvim](https://github.com/scottmckendry/cyberdream.nvim) (stars: 886, last update: 2025-03-18)
107+
- [scottmckendry/cyberdream.nvim](https://github.com/scottmckendry/cyberdream.nvim) (stars: 886, last update: 2025-03-19)
112108
- cyberdream
113109
- cyberdream-light
114-
- [srcery-colors/srcery-vim](https://github.com/srcery-colors/srcery-vim) (stars: 850, last update: 2025-03-15)
110+
- [srcery-colors/srcery-vim](https://github.com/srcery-colors/srcery-vim) (stars: 850, last update: 2025-03-16)
115111
- srcery
116112
- [bluz71/vim-nightfly-colors](https://github.com/bluz71/vim-nightfly-colors) (stars: 846, last update: 2025-03-18)
117113
- nightfly
118-
- [zenbones-theme/zenbones.nvim](https://github.com/zenbones-theme/zenbones.nvim) (stars: 838, last update: 2025-03-04)
114+
- [zenbones-theme/zenbones.nvim](https://github.com/zenbones-theme/zenbones.nvim) (stars: 838, last update: 2025-03-05)
119115
- duckbones
120116
- forestbones
121117
- kanagawabones
@@ -129,19 +125,19 @@ ColorSchemes List (60)
129125
- zenbones
130126
- zenburned
131127
- zenwritten
132-
- [pineapplegiant/spaceduck](https://github.com/pineapplegiant/spaceduck) (stars: 819, last update: 2022-02-21)
128+
- [pineapplegiant/spaceduck](https://github.com/pineapplegiant/spaceduck) (stars: 819, last update: 2022-02-22)
133129
- spaceduck
134130
- [alexvzyl/nordic.nvim](https://github.com/alexvzyl/nordic.nvim) (stars: 815, last update: 2025-03-18)
135131
- nordic
136-
- [raphamorim/lucario](https://github.com/raphamorim/lucario) (stars: 815, last update: 2024-11-08)
132+
- [raphamorim/lucario](https://github.com/raphamorim/lucario) (stars: 815, last update: 2024-11-09)
137133
- lucario
138-
- [savq/melange-nvim](https://github.com/savq/melange-nvim) (stars: 799, last update: 2025-01-16)
134+
- [savq/melange-nvim](https://github.com/savq/melange-nvim) (stars: 799, last update: 2025-01-17)
139135
- melange
140136
- [mofiqul/vscode.nvim](https://github.com/mofiqul/vscode.nvim) (stars: 785, last update: 2025-03-09)
141137
- vscode
142-
- [fenetikm/falcon](https://github.com/fenetikm/falcon) (stars: 766, last update: 2024-12-02)
138+
- [fenetikm/falcon](https://github.com/fenetikm/falcon) (stars: 766, last update: 2024-12-03)
143139
- falcon
144-
- [tjdevries/colorbuddy.nvim](https://github.com/tjdevries/colorbuddy.nvim) (stars: 698, last update: 2024-05-08)
140+
- [tjdevries/colorbuddy.nvim](https://github.com/tjdevries/colorbuddy.nvim) (stars: 698, last update: 2024-05-09)
145141
- colorbuddy
146142
- gruvbuddy
147143
- [embark-theme/vim](https://github.com/embark-theme/vim) (stars: 671, last update: 2025-01-26)
@@ -162,7 +158,7 @@ ColorSchemes List (60)
162158
- space-vim-dark
163159
- [wadackel/vim-dogrun](https://github.com/wadackel/vim-dogrun) (stars: 585, last update: 2024-08-25)
164160
- dogrun
165-
- [rmehri01/onenord.nvim](https://github.com/rmehri01/onenord.nvim) (stars: 559, last update: 2025-01-03)
161+
- [rmehri01/onenord.nvim](https://github.com/rmehri01/onenord.nvim) (stars: 559, last update: 2025-01-04)
166162
- onenord
167163
- onenord-light
168164
- [rrethy/base16-nvim](https://github.com/rrethy/base16-nvim) (stars: 550, last update: 2025-02-22)
@@ -442,7 +438,7 @@ ColorSchemes List (60)
442438
- base16-xcode-dusk
443439
- base16-zenbones
444440
- base16-zenburn
445-
- [kristijanhusak/vim-hybrid-material](https://github.com/kristijanhusak/vim-hybrid-material) (stars: 550, last update: 2020-06-16)
441+
- [kristijanhusak/vim-hybrid-material](https://github.com/kristijanhusak/vim-hybrid-material) (stars: 550, last update: 2020-06-17)
446442
- hybrid_material
447443
- hybrid_reverse
448444
- [loctvl842/monokai-pro.nvim](https://github.com/loctvl842/monokai-pro.nvim) (stars: 539, last update: 2025-02-24)

collect-after.log

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
60
1+
58

collect-before.log

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
56
1+
58

0 commit comments

Comments
 (0)