1 files changed, 1 insertions, 7 deletions
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