aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main/clamav/APKBUILD4
1 files changed, 0 insertions, 4 deletions
diff --git a/main/clamav/APKBUILD b/main/clamav/APKBUILD
index 008cad5b9c..549cc07ba2 100644
--- a/main/clamav/APKBUILD
+++ b/main/clamav/APKBUILD
@@ -63,11 +63,7 @@ build() {
mkdir -p "$pkgdir"/var/run/clamav "$pkgdir"/var/log/clamav
}
-<<<<<<< HEAD
-md5sums="eaf9fccc3cc3567605a9732313652967 clamav-0.95.3.tar.gz
-=======
md5sums="38e7870db6e9ad0e569518499a6f3651 clamav-0.96.1.tar.gz
->>>>>>> e78cd26... main/clamav: upgrade to 0.96.1
d64432c463850663c5041c3097f3e903 clamd.initd
567bc32b657dd7031b9b7beaa946203a clamd.confd
f4d1f415322905128dc27135566ad136 freshclam.initd