diff options
author | raveit65 <chat-to-me@raveit.de> | 2015-06-27 22:35:36 +0200 |
---|---|---|
committer | raveit65 <chat-to-me@raveit.de> | 2015-06-27 22:35:36 +0200 |
commit | bcc8a11e05c9e1479e71d1696084e9e509fe2e92 (patch) | |
tree | ea972a0ed2ab0677aa1578eef5809d8730af21e9 /HACKING | |
parent | 9978fdd46962be0acfcfddfb489b19f949f88bb4 (diff) | |
download | mate-panel-bcc8a11e05c9e1479e71d1696084e9e509fe2e92.tar.bz2 mate-panel-bcc8a11e05c9e1479e71d1696084e9e509fe2e92.tar.xz |
help: clock and fish: fix merge conflicts during build
Diffstat (limited to 'HACKING')
0 files changed, 0 insertions, 0 deletions