From 0adaa7b88291768302d8d9deb27441743ad7581c Mon Sep 17 00:00:00 2001
From: Ache <ache@ache.one>
Date: Wed, 18 May 2016 20:26:05 +0200
Subject: moc -> mpd

---
 bookmarks | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'bookmarks')

diff --git a/bookmarks b/bookmarks
index f79de59..dc8b9a3 100644
--- a/bookmarks
+++ b/bookmarks
@@ -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
-- 
cgit v1.2.3