Fixed merge

This commit is contained in:
Tibo De Peuter 2022-04-09 21:52:10 +02:00
parent e6fa1f9311
commit 7983d464b2

View file

@ -31,10 +31,7 @@ pacman -S dunst
``` ```
yay onedrive-abraunegg onedrive_tray-git yay onedrive-abraunegg onedrive_tray-git
<<<<<<< HEAD
yay typora-free yay typora-free
=======
>>>>>>> 8590bb0c29c558fb73c4132762a346ded7b986ce
``` ```
Take the folowwing config files Take the folowwing config files