Fixed merge
This commit is contained in:
parent
e6fa1f9311
commit
7983d464b2
1 changed files with 0 additions and 3 deletions
3
Guide.md
3
Guide.md
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue