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 | |
| parent | 3cdf6a60ab9154fbb00f490ec9fb3c32c20f2c59 (diff) | |
| parent | b128a543dea0a9ce0228d4e96b2e2f06fd70c725 (diff) | |
| download | aur-34fc942d519e89c3185f6419ee3d9cf55d492f16.tar.gz | |
Merge branch 'master' of ssh://aur.archlinux.org/tor-browser-ja
Fix conflict
| -rw-r--r-- | .SRCINFO | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,5 +1,5 @@ # Generated by mksrcinfo v8 -# Mon Jan 30 07:57:10 UTC 2017 +# Mon Jan 30 08:08:50 UTC 2017 pkgbase = tor-browser-ja pkgdesc = Tor Browser Bundle: Anonymous browsing using firefox and tor pkgver = 6.5 |