summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
authorChris Severance2015-09-03 14:30:42 -0400
committerChris Severance2015-09-03 14:30:42 -0400
commit94fb7f333e7f8aa67b56950bab1b0b89f66a9d94 (patch)
tree4995c6a75f32ea4bdfb911dae202d3563f8bf9c3 /PKGBUILD
parent69eba0242d7987ba212f0fa9ac564094d12ea6ba (diff)
downloadaur-94fb7f333e7f8aa67b56950bab1b0b89f66a9d94.tar.gz
Unmangle git merge
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD8
1 files changed, 0 insertions, 8 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 005c72ca06f..b9f6945415c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -173,10 +173,6 @@ optdepends=('ttf-office-2007-fonts')
provides=('ttf-font' 'ttf-ms-fonts' 'ttf-tahoma' 'ttf-vista-fonts')
conflicts=('ttf-ms-fonts' 'ttf-tahoma' 'ttf-vista-fonts' 'ttf-ms-win8' 'ttf-win7-fonts-autodownload')
install="${pkgbase}.install"
-<<<<<<< HEAD
-=======
-source=('license.rtf' 'FONTVER.pl' "20-${_pkgbase}-"{latin,japanese,korean,zh_cn,zh_tw}'.conf')
->>>>>>> 81dd7bfbd1fac3f6157019e9206db4466b690771
_sfpath="http://downloads.sourceforge.net/corefonts"
source=('license.rtf' 'FONTVER.pl' "20-${_pkgbase}-"{latin,japanese,korean,zh_cn,zh_tw}'.conf')
source+=("${_sfpath}/andale32.exe") # "${_sfpath}/arialb32.exe")
@@ -1231,11 +1227,7 @@ build() {
}
# This package function is only used by font packages that do not have a pkgbase like ttf-office-2007.
-<<<<<<< HEAD
# It is not used in packages with splits ttf-win7-fonts or ttf-ms-win8.
-=======
-# It is not used by split packages ttf-win7-fonts or ttf-ms-win8.
->>>>>>> 81dd7bfbd1fac3f6157019e9206db4466b690771
package() {
set -u
cd "${srcdir}"