fixed merge conflicts
This commit is contained in:
commit
7659c4198c
4 changed files with 58 additions and 15 deletions
|
@ -10,6 +10,7 @@ ffmpeg,"Complete and free Internet live audio and video broadcasting solution fo
|
|||
foot,"Fast, lightweight and minimalistic Wayland terminal emulator",N,
|
||||
fuzzel,"Application launcher for wlroots-based Wayland compositors",N,
|
||||
greetd,"Minimal and flexible login manager daemon",N,
|
||||
greetd-agreety,"Simple, text-based greeter",N,
|
||||
grim,"Grabs images from Wayland compositors",N,
|
||||
imv-wayland,"Image viewer for Wayland",N,
|
||||
kanshi,"Dynamic display configuration for Wayland",N,
|
||||
|
|
Can't render this file because it contains an unexpected character in line 8 and column 101.
|
Loading…
Add table
Add a link
Reference in a new issue