Commit 86554d9
committed
chore: merge two branches with 'octopus' strategy
Merge branches 'feat-setup-improve-color-contrast' and
'feat-setup-improve-private-statusbar' into 'dev'.
Addresses:
- catppuccin#3
- catppuccin#41 file changed
+2
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
290 | 290 | | |
291 | 291 | | |
292 | 292 | | |
293 | | - | |
| 293 | + | |
294 | 294 | | |
295 | 295 | | |
296 | 296 | | |
297 | | - | |
| 297 | + | |
298 | 298 | | |
299 | 299 | | |
300 | 300 | | |
| |||
0 commit comments