summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMASAKI Haruka2019-06-12 23:15:31 +0900
committerMASAKI Haruka2019-06-12 23:15:31 +0900
commit45136c8acf87e4f168074b8ae9a98dcf98a9358f (patch)
treef65527736fe1310b5f87da19aeda2aa824e6e53b
parenteb091cc1b95422314f311adaa2f0390a610d4a14 (diff)
downloadaur-45136c8acf87e4f168074b8ae9a98dcf98a9358f.tar.gz
fix PKGBUILD mistake.
-rw-r--r--PKGBUILD5
1 files changed, 0 insertions, 5 deletions
diff --git a/PKGBUILD b/PKGBUILD
index d9e818212e5..e9bdd6f4cd5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,13 +20,8 @@ url="https://osdn.net/users/utuhiro/pf/utuhiro/files/"
license=('custom')
makedepends=('clang' 'ninja' 'pkg-config' 'python2' 'curl' 'gtk2' 'qt5-base' 'zinnia' 'fcitx' 'libxcb' 'glib2' 'bzip2' 'unzip')
-<<<<<<< HEAD
source=('https://osdn.net/frs/chamber_redir.php?m=jaist&f=%2Fusers%2F24%2F24261%2Fmozc-neologd-ut-2.23.2815.102.20190530.1.tar.xz'
- add-new-japanese-era.patch
-=======
-source=('https://osdn.net/frs/chamber_redir.php?m=iij&f=%2Fusers%2F23%2F23988%2Fmozc-neologd-ut-2.23.2815.102.20190422.1.tar.xz'
add-new-japanese-era.patch
->>>>>>> 08dc40a1f6579b0242398819b141c2b5f0156881
# https://github.com/google/mozc/issues/441#issue-321728877
fix-for-gcc81.patch
http://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-icon.tar.gz)