diff options
author | Didier Richard | 2019-01-02 23:47:24 +0100 |
---|---|---|
committer | Didier Richard | 2019-01-02 23:47:24 +0100 |
commit | 0897f0b5b2248efdd919f056bed0596ed5f1fc42 (patch) | |
tree | 91fa62c6dff8714773ebc59436e91f0b4348ed3a | |
parent | c827f4386753705e2b20a5805aa0954b43347b45 (diff) | |
parent | e9103fabc51bd3c89235325e52a4c13efd1cef38 (diff) | |
download | aur-0897f0b5b2248efdd919f056bed0596ed5f1fc42.tar.gz |
Merge branch 'master' of ssh://aur.archlinux.org/pamac-tray-appindicator
Fix merge conflit
0 files changed, 0 insertions, 0 deletions