diff options
author | Gabriele Musco | 2018-10-22 16:19:00 +0200 |
---|---|---|
committer | Gabriele Musco | 2018-10-22 16:19:00 +0200 |
commit | 6fa933c48b251d2291b788c99618ee0565233a80 (patch) | |
tree | ccee3758cfa4fe76f69d54dfc95be614dac1caf5 /.SRCINFO | |
parent | 011e943f745c6137b240080ca9fe17bc7dd84919 (diff) | |
parent | d44e9a7b81ccfb5c4755cbd93e24b4221bce502d (diff) | |
download | aur-6fa933c48b251d2291b788c99618ee0565233a80.tar.gz |
resolved merge conflict
Diffstat (limited to '.SRCINFO')
0 files changed, 0 insertions, 0 deletions