diff options
| author | Ache <ache@ache.one> | 2016-05-18 20:26:05 +0200 |
|---|---|---|
| committer | Ache <ache@ache.one> | 2016-05-18 20:26:05 +0200 |
| commit | 0adaa7b88291768302d8d9deb27441743ad7581c (patch) | |
| tree | cfebb197b3fdc9c62061d1a99d34539587d35fde /bookmarks | |
| parent | Correction (diff) | |
moc -> mpd
Diffstat (limited to 'bookmarks')
| -rw-r--r-- | bookmarks | 8 |
1 files changed, 1 insertions, 7 deletions
@@ -1,10 +1,4 @@ -<<<<<<< HEAD -M:/home/ache -m:/media -':/home/ache/Downloads -======= m:/media -':/home/ache/TPC_3 M:/home/ache ->>>>>>> 6dcfa9bf6ad0daa4aa3080650d32e4da04e70822 k:/home/ache/Téléchargements +':/home/ache/Téléchargements |