diff options
author | Atnanasi | 2017-01-30 17:09:11 +0900 |
---|---|---|
committer | Atnanasi | 2017-01-30 17:09:11 +0900 |
commit | 34fc942d519e89c3185f6419ee3d9cf55d492f16 (patch) | |
tree | f267e1a0824d83b5ab75ddbf6ea9379ffa590beb /PKGBUILD | |
parent | 3cdf6a60ab9154fbb00f490ec9fb3c32c20f2c59 (diff) | |
parent | b128a543dea0a9ce0228d4e96b2e2f06fd70c725 (diff) | |
download | aur-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