summaryrefslogtreecommitdiff
path: root/.config/ranger/bookmarks
diff options
context:
space:
mode:
Diffstat (limited to '.config/ranger/bookmarks')
-rw-r--r--.config/ranger/bookmarks4
1 files changed, 4 insertions, 0 deletions
diff --git a/.config/ranger/bookmarks b/.config/ranger/bookmarks
index fbfc93a..d0e6b67 100644
--- a/.config/ranger/bookmarks
+++ b/.config/ranger/bookmarks
@@ -9,5 +9,9 @@ s:/home/lxf/sites/luxagraf.net
c:/home/lxf/pictures/nextcloud-ccg-phone
t:/home/lxf/temp
p:/home/lxf/temp/wired
+<<<<<<< HEAD
k:/home/lxf/videos/downloads
':/home/lxf/bin
+=======
+':/usr/share/applications
+>>>>>>> dbb33e4bfbf7b9e7fe3f3a38cc501bc3d3aa4732