summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCsonka Mihaly2019-05-02 17:20:14 +0200
committerCsonka Mihaly2019-05-02 17:20:14 +0200
commit6dec639cd226b077c67934439933af557be5398f (patch)
treeba4c576b9c55a6eacc86bb780ce3c4b5e0e0ecf9
parent732d670a298ba86b8c9b62f4a969b5eead6be841 (diff)
parent62111941122a9f956d93519b3f195c4dd7573a4f (diff)
downloadaur-6dec639cd226b077c67934439933af557be5398f.tar.gz
Fix conflict
0 files changed, 0 insertions, 0 deletions