diff options
| author | Urbain Vaes <urbain@vaes.uk> | 2015-03-30 12:12:49 +0100 |
|---|---|---|
| committer | Urbain Vaes <urbain@vaes.uk> | 2015-03-30 12:12:49 +0100 |
| commit | 9a2ebe8e34e8be613da5e975b8a76e3b8ae7e215 (patch) | |
| tree | 612db282ca020914bfcc087638766abf83b1e8ab /vifm/Trash | |
| parent | b7e66c07bc4d99f03c542a77ee5e7aa353dd16c3 (diff) | |
| parent | 6fb28bc4b38947281908917b9230e78692674fdc (diff) | |
resolved merge conflicts
Diffstat (limited to 'vifm/Trash')
| -rw-r--r-- | vifm/Trash | bin | 98630 -> 0 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/vifm/Trash b/vifm/Trash Binary files differdeleted file mode 100644 index 12c6f49..0000000 --- a/vifm/Trash +++ /dev/null |