fix: merge conflict

pull/1/head
Pocco81 2 years ago
commit b584ea5b91

@ -0,0 +1,3 @@
# These are supported funding model platforms
open_collective: catppuccin

@ -6,7 +6,7 @@
</h3> </h3>
<h6 align="center"> <h6 align="center">
<a href="https://github.com/catppuccin/catppuccin#-palette">Palettes</a> <a href="https://github.com/catppuccin/catppuccin#-palettes">Palettes</a>
· ·
<a href="https://github.com/catppuccin/catppuccin#-ports-and-more">Ports</a> <a href="https://github.com/catppuccin/catppuccin#-ports-and-more">Ports</a>
· ·
@ -54,7 +54,7 @@ Join our community!
### 🎨 Palettes ### 🎨 Palettes
**Catppuccin** constist of 4 beautiful pastel color palettes. All the details can be found below.<br> **Catppuccin** consists of 4 beautiful pastel color palettes. All the details can be found below.<br>
To make the best use them please refer to the [style guide](https://github.com/catppuccin/catppuccin/blob/main/docs/style-guide.md). To make the best use them please refer to the [style guide](https://github.com/catppuccin/catppuccin/blob/main/docs/style-guide.md).
<br><img src="assets/misc/transparent.png" height="10" width="0" /> <br><img src="assets/misc/transparent.png" height="10" width="0" />
@ -848,53 +848,55 @@ Catppuccin is available for various apps and in different formats. Here is a lis
#### IDEs/DEs #### IDEs/DEs
- [Nvim](https://github.com/catppuccin/nvim)
- [VSCode](https://github.com/catppuccin/vscode)
- [Sublime-text](https://github.com/catppuccin/sublime-text)
- [Emacs](https://github.com/catppuccin/emacs) - [Emacs](https://github.com/catppuccin/emacs)
- [Jetbrains](https://github.com/catppuccin/jetbrains)
- [Geany](https://github.com/catppuccin/geany) - [Geany](https://github.com/catppuccin/geany)
- [Micro](https://github.com/catppuccin/micro) - [Gedit](https://github.com/catppuccin/gedit)
- [Vim](https://github.com/catppuccin/vim)
- [Helix](https://github.com/catppuccin/helix) - [Helix](https://github.com/catppuccin/helix)
- [Kakoune](https://github.com/catppuccin/kakoune)
- [Xcode](https://github.com/catppuccin/xcode)
- [Insomnia](https://github.com/catppuccin/insomnia) - [Insomnia](https://github.com/catppuccin/insomnia)
- [Gedit](https://github.com/catppuccin/gedit) - [Jetbrains](https://github.com/catppuccin/jetbrains)
- [Kakoune](https://github.com/catppuccin/kakoune)
- [Micro](https://github.com/catppuccin/micro)
- [Nvim](https://github.com/catppuccin/nvim)
- [Sublime-text](https://github.com/catppuccin/sublime-text)
- [VSCode](https://github.com/catppuccin/vscode)
- [Vim](https://github.com/catppuccin/vim)
- [Visual Studio](https://github.com/catppuccin/visual-studio) - [Visual Studio](https://github.com/catppuccin/visual-studio)
- [Xcode](https://github.com/catppuccin/xcode)
#### Development #### Development
- [Template](https://github.com/catppuccin/template)
- [Wallpapers](https://github.com/catppuccin/wallpapers)
- [Palette](https://github.com/catppuccin/palette) - [Palette](https://github.com/catppuccin/palette)
- [Toolbox](https://github.com/catppuccin/toolbox)
- [TailwindCSS](https://github.com/catppuccin/tailwindcss) - [TailwindCSS](https://github.com/catppuccin/tailwindcss)
- [Template](https://github.com/catppuccin/template)
- [Toolbox](https://github.com/catppuccin/toolbox)
- [mdBook](https://github.com/catppuccin/mdBook) - [mdBook](https://github.com/catppuccin/mdBook)
#### System #### System
- [Xresources](https://github.com/catppuccin/xresources) - [Alfred](https://github.com/catppuccin/alfred)
- [Cava](https://github.com/catppuccin/cava) - [Bat](https://github.com/catppuccin/bat)
- [Gtk](https://github.com/catppuccin/gtk)
- [Btop](https://github.com/catppuccin/btop) - [Btop](https://github.com/catppuccin/btop)
- [Mako](https://github.com/catppuccin/mako) - [Cava](https://github.com/catppuccin/cava)
- [Kde](https://github.com/catppuccin/kde) - [Conky](https://github.com/catppuccin/conky)
- [Grub](https://github.com/catppuccin/grub)
- [Sddm](https://github.com/catppuccin/sddm)
- [Rofi](https://github.com/catppuccin/rofi)
- [Plank](https://github.com/catppuccin/plank)
- [Lxqt](https://github.com/catppuccin/lxqt)
- [Floris-board](https://github.com/catppuccin/floris-board)
- [Cursors](https://github.com/catppuccin/cursors) - [Cursors](https://github.com/catppuccin/cursors)
- [Dunst](https://github.com/catppuccin/dunst) - [Dunst](https://github.com/catppuccin/dunst)
- [Papirus-folders](https://github.com/catppuccin/papirus-folders) - [Floris-board](https://github.com/catppuccin/floris-board)
- [Alfred](https://github.com/catppuccin/alfred)
- [Fzf](https://github.com/catppuccin/fzf) - [Fzf](https://github.com/catppuccin/fzf)
- [Conky](https://github.com/catppuccin/conky) - [Grub](https://github.com/catppuccin/grub)
- [Gtk](https://github.com/catppuccin/gtk)
- [Kde](https://github.com/catppuccin/kde)
- [Kvantum](https://github.com/catppuccin/Kvantum) - [Kvantum](https://github.com/catppuccin/Kvantum)
- [Bat](https://github.com/catppuccin/bat) - [Lxqt](https://github.com/catppuccin/lxqt)
- [Mako](https://github.com/catppuccin/mako)
- [Midnight Commander](https://github.com/catppuccin/mc) - [Midnight Commander](https://github.com/catppuccin/mc)
- [Papirus-folders](https://github.com/catppuccin/papirus-folders)
- [Plank](https://github.com/catppuccin/plank)
- [Polybar](https://github.com/catppuccin/polybar)
- [Rofi](https://github.com/catppuccin/rofi)
- [Sddm](https://github.com/catppuccin/sddm)
- [Wallpapers](https://github.com/catppuccin/wallpapers)
- [Waybar](https://github.com/catppuccin/waybar)
- [Xresources](https://github.com/catppuccin/xresources)
- [tty](https://github.com/catppuccin/tty) - [tty](https://github.com/catppuccin/tty)
#### Shells #### Shells
@ -903,11 +905,11 @@ Catppuccin is available for various apps and in different formats. Here is a lis
#### Productivity #### Productivity
- [Zathura](https://github.com/catppuccin/zathura)
- [GitHub](https://github.com/catppuccin/github) - [GitHub](https://github.com/catppuccin/github)
- [Neomutt](https://github.com/catppuccin/neomutt) - [Neomutt](https://github.com/catppuccin/neomutt)
- [ShareX](https://github.com/catppuccin/sharex) - [ShareX](https://github.com/catppuccin/sharex)
- [Sumatra PDF](https://github.com/catppuccin/sumatra-pdf) - [Sumatra PDF](https://github.com/catppuccin/sumatra-pdf)
- [Zathura](https://github.com/catppuccin/zathura)
#### Leisure #### Leisure
@ -917,29 +919,31 @@ Catppuccin is available for various apps and in different formats. Here is a lis
- [Last.fm](https://github.com/catppuccin/lastfm) - [Last.fm](https://github.com/catppuccin/lastfm)
- [Steam](https://github.com/catppuccin/steam) - [Steam](https://github.com/catppuccin/steam)
- [Blockbench](https://github.com/catppuccin/blockbench) - [Blockbench](https://github.com/catppuccin/blockbench)
- [PyRadio](https://github.com/catppuccin/pyradio) - [PyRadio](https://github.com/catppuccin/pyradio)
#### Browsers #### Browsers
- [Firefox](https://github.com/catppuccin/firefox)
- [Chrome](https://github.com/catppuccin/chrome) - [Chrome](https://github.com/catppuccin/chrome)
- [Firefox](https://github.com/catppuccin/firefox)
- [qutebrowser](https://github.com/catppuccin/qutebrowser) - [qutebrowser](https://github.com/catppuccin/qutebrowser)
#### Search engines #### Search engines
- [DuckDuckGo](https://github.com/catppuccin/duckduckgo) - [DuckDuckGo](https://github.com/catppuccin/duckduckgo)
- [Whoogle](https://github.com/catppuccin/whoogle) - [Whoogle](https://github.com/catppuccin/whoogle)
#### Extensions #### Extensions
- [Noir](https://github.com/catppuccin/noir)
- [Dark Reader](https://github.com/catppuccin/dark-reader) - [Dark Reader](https://github.com/catppuccin/dark-reader)
- [Noir](https://github.com/catppuccin/noir)
- [Vimium](https://github.com/catppuccin/vimium) - [Vimium](https://github.com/catppuccin/vimium)
#### Messaging #### Messaging
- [Telegram](https://github.com/catppuccin/telegram)
- [Revolt](https://github.com/catppuccin/revolt)
- [Discord](https://github.com/catppuccin/discord)
- [Cinny](https://github.com/catppuccin/cinny) - [Cinny](https://github.com/catppuccin/cinny)
- [Discord](https://github.com/catppuccin/discord)
- [Revolt](https://github.com/catppuccin/revolt)
- [Telegram](https://github.com/catppuccin/telegram)
#### Note-taking #### Note-taking
@ -949,39 +953,40 @@ Catppuccin is available for various apps and in different formats. Here is a lis
#### Terminals #### Terminals
- [Alacritty](https://github.com/catppuccin/alacritty) - [Alacritty](https://github.com/catppuccin/alacritty)
- [St](https://github.com/catppuccin/st) - [Black Box](https://github.com/catppuccin/blackbox)
- [Contour](https://github.com/catppuccin/contour)
- [Fcitx5](https://github.com/catppuccin/fcitx5)
- [Foot](https://github.com/catppuccin/foot)
- [Gnome-terminal](https://github.com/catppuccin/gnome-terminal)
- [Hyper](https://github.com/catppuccin/hyper) - [Hyper](https://github.com/catppuccin/hyper)
- [Iterm](https://github.com/catppuccin/iterm) - [Iterm](https://github.com/catppuccin/iterm)
- [Urxvt](https://github.com/catppuccin/urxvt)
- [Gnome-terminal](https://github.com/catppuccin/gnome-terminal)
- [Terminator](https://github.com/catppuccin/terminator)
- [Kitty](https://github.com/catppuccin/kitty) - [Kitty](https://github.com/catppuccin/kitty)
- [Tmux](https://github.com/catppuccin/tmux)
- [Termux](https://github.com/catppuccin/termux)
- [Konsole](https://github.com/catppuccin/konsole) - [Konsole](https://github.com/catppuccin/konsole)
- [Xfce4-terminal](https://github.com/catppuccin/xfce4-terminal) - [St](https://github.com/catppuccin/st)
- [Windows-terminal](https://github.com/catppuccin/windows-terminal) - [Tabby](https://github.com/catppuccin/tabby)
- [Contour](https://github.com/catppuccin/contour) - [Terminator](https://github.com/catppuccin/terminator)
- [Wezterm](https://github.com/catppuccin/wezterm) - [Termux](https://github.com/catppuccin/termux)
- [Tilix](https://github.com/catppuccin/tilix)
- [Tmux](https://github.com/catppuccin/tmux)
- [Tym](https://github.com/catppuccin/tym) - [Tym](https://github.com/catppuccin/tym)
- [Fcitx5](https://github.com/catppuccin/fcitx5) - [Urxvt](https://github.com/catppuccin/urxvt)
- [Wezterm](https://github.com/catppuccin/wezterm)
- [Windows-terminal](https://github.com/catppuccin/windows-terminal)
- [Xfce4-terminal](https://github.com/catppuccin/xfce4-terminal)
- [Zellij](https://github.com/catppuccin/zellij) - [Zellij](https://github.com/catppuccin/zellij)
- [Foot](https://github.com/catppuccin/foot)
- [Tilix](https://github.com/catppuccin/tilix)
- [Black Box](https://github.com/catppuccin/blackbox)
- [Zutty](https://github.com/catppuccin/zutty) - [Zutty](https://github.com/catppuccin/zutty)
- [Tabby](https://github.com/catppuccin/tabby)
#### Social #### Social
- [Aliucord](https://github.com/catppuccin/Aliucord)
- [Anilist](https://github.com/catppuccin/anilist)
- [Github-readme-stats](https://github.com/catppuccin/github-readme-stats)
- [Libreddit](https://github.com/catppuccin/libreddit) - [Libreddit](https://github.com/catppuccin/libreddit)
- [Monkeytype](https://github.com/catppuccin/monkeytype)
- [YouTube](https://github.com/catppuccin/youtube)
- [Mailspring](https://github.com/catppuccin/mailspring) - [Mailspring](https://github.com/catppuccin/mailspring)
- [Monkeytype](https://github.com/catppuccin/monkeytype)
- [Nitter](https://github.com/catppuccin/nitter)
- [Thunderbird](https://github.com/catppuccin/thunderbird) - [Thunderbird](https://github.com/catppuccin/thunderbird)
- [Aliucord](https://github.com/catppuccin/Aliucord) - [YouTube](https://github.com/catppuccin/youtube)
- [Github-readme-stats](https://github.com/catppuccin/github-readme-stats)
- [Anilist](https://github.com/catppuccin/anilist)
&nbsp; &nbsp;

Loading…
Cancel
Save