1 files changed, 6 insertions, 0 deletions
diff --git a/bookmarks b/bookmarks
index a1a45eb..f79de59 100644
--- a/bookmarks
+++ b/bookmarks
@@ -1,4 +1,10 @@
+<<<<<<< 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