summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
authorJoseph Simone2017-01-10 09:32:15 -0800
committerJoseph Simone2017-01-10 09:41:28 -0800
commitbf50b42f57f77023ae6ffe131e7b4fa45455ee46 (patch)
treead1328b556df329b6d525d12ea885c33b645a457 /PKGBUILD
parentf8f6880524e6ac678305eeeb68cebdecb8804799 (diff)
downloadaur-bf50b42f57f77023ae6ffe131e7b4fa45455ee46.tar.gz
Cleaning rebase
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD3
1 files changed, 0 insertions, 3 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 3d43a9a28b0f..55ce5879c261 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,6 @@ pkgver='1.3.0'
pkgrel=1
source=(http://cs.psn-web.net/support/fax/common/file/Linux_ScanDriver/panamfs-scan-1.3.0-x86_64.tar.gz)
md5sums=('2e4c844e89c2e7e0b6258be5ef52ace9')
-<<<<<<< HEAD
#package(){
##! /bin/sh
##
@@ -367,5 +366,3 @@ md5sums=('2e4c844e89c2e7e0b6258be5ef52ace9')
#exit 0
#
#}
-=======
->>>>>>> eedc70e... Initial commit, dl-only pkgbuild