summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
authorAtnanasi2017-01-30 17:09:11 +0900
committerAtnanasi2017-01-30 17:09:11 +0900
commit34fc942d519e89c3185f6419ee3d9cf55d492f16 (patch)
treef267e1a0824d83b5ab75ddbf6ea9379ffa590beb /PKGBUILD
parent3cdf6a60ab9154fbb00f490ec9fb3c32c20f2c59 (diff)
parentb128a543dea0a9ce0228d4e96b2e2f06fd70c725 (diff)
downloadaur-34fc942d519e89c3185f6419ee3d9cf55d492f16.tar.gz
Merge branch 'master' of ssh://aur.archlinux.org/tor-browser-ja
Fix conflict
Diffstat (limited to 'PKGBUILD')
0 files changed, 0 insertions, 0 deletions