summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLucas Melo2021-09-07 11:43:32 -0300
committerLucas Melo2021-09-07 11:43:32 -0300
commitc34fbe67856cabc2b56038b1b85d11e407346ac9 (patch)
treea11d9178ce160e77fc92ab9ce1f5993dfc9bad46
parent9fcfaeccbb4556ac59f2489d75c33220a1761ed5 (diff)
parent3076e55b51718d73effb545f6555c51d9926e694 (diff)
downloadaur-c34fbe67856cabc2b56038b1b85d11e407346ac9.tar.gz
Fixed conflict after pull
0 files changed, 0 insertions, 0 deletions