summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bookmarks6
-rw-r--r--colorschemes/__pycache__/__init__.cpython-35.opt-1.pycbin133 -> 133 bytes
-rw-r--r--colorschemes/__pycache__/try.cpython-35.opt-1.pycbin2547 -> 2547 bytes
-rw-r--r--history48
4 files changed, 6 insertions, 48 deletions
diff --git a/bookmarks b/bookmarks
index d60c9c1..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
diff --git a/colorschemes/__pycache__/__init__.cpython-35.opt-1.pyc b/colorschemes/__pycache__/__init__.cpython-35.opt-1.pyc
index 5e1e5a2..aabf813 100644
--- a/colorschemes/__pycache__/__init__.cpython-35.opt-1.pyc
+++ b/colorschemes/__pycache__/__init__.cpython-35.opt-1.pyc
Binary files differ
diff --git a/colorschemes/__pycache__/try.cpython-35.opt-1.pyc b/colorschemes/__pycache__/try.cpython-35.opt-1.pyc
index fc589ad..b28a079 100644
--- a/colorschemes/__pycache__/try.cpython-35.opt-1.pyc
+++ b/colorschemes/__pycache__/try.cpython-35.opt-1.pyc
Binary files differ
diff --git a/history b/history
deleted file mode 100644
index 814aa37..0000000
--- a/history
+++ /dev/null
@@ -1,48 +0,0 @@
-search Hello
-filter .m4a
-dete
-search Vidéo
-open_with
-
-filter .webm
-open_with vlc
-find
-filter
-filter .swf
-open_with flash
-open_with flashplayer
-search .config
-search ranger
-shell
-shell sudo mount /mnt/Archive
-search M
-search Mus
-filter mp4
-find Télé
-filter pdf
-filter png
-open_with gthumb
-find Im
-find .conf
-
-open_with vim
-search Hor
-search eti
-open_with gThumb
-find Doc
-find phon
-filter .mp4
-filter
-search Témoi
-search DDB
-find Dow
-search Télé
-rename fichier.html
-open_with 7
-w
-search GAI
-open_with ²&
-open_with 1
-open_with
-shell u
-delete