summaryrefslogtreecommitdiff
path: root/help/mate-fish/el
diff options
context:
space:
mode:
authorraveit65 <[email protected]>2015-06-27 22:35:36 +0200
committerraveit65 <[email protected]>2015-06-27 22:35:36 +0200
commitbcc8a11e05c9e1479e71d1696084e9e509fe2e92 (patch)
treeea972a0ed2ab0677aa1578eef5809d8730af21e9 /help/mate-fish/el
parent9978fdd46962be0acfcfddfb489b19f949f88bb4 (diff)
downloadmate-panel-bcc8a11e05c9e1479e71d1696084e9e509fe2e92.tar.bz2
mate-panel-bcc8a11e05c9e1479e71d1696084e9e509fe2e92.tar.xz
help: clock and fish: fix merge conflicts during build
Diffstat (limited to 'help/mate-fish/el')
0 files changed, 0 insertions, 0 deletions