diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2010-06-11 12:16:27 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-06-11 12:16:27 +0000 |
| commit | 08b046419f188e8aa12881639ec02a22b40fde64 (patch) | |
| tree | ab9fe729861b342b7f3c39d6c2c2d6ed30b8ef26 | |
| parent | 2bda75f50203a38bfcfbe5a39c8b23b96c7b4241 (diff) | |
| download | alpine_aports-08b046419f188e8aa12881639ec02a22b40fde64.tar.bz2 alpine_aports-08b046419f188e8aa12881639ec02a22b40fde64.tar.xz alpine_aports-08b046419f188e8aa12881639ec02a22b40fde64.zip | |
main/clamav: fix uncomplete conflict resolve
| -rw-r--r-- | main/clamav/APKBUILD | 4 |
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() { | |||
| 63 | mkdir -p "$pkgdir"/var/run/clamav "$pkgdir"/var/log/clamav | 63 | mkdir -p "$pkgdir"/var/run/clamav "$pkgdir"/var/log/clamav |
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | <<<<<<< HEAD | ||
| 67 | md5sums="eaf9fccc3cc3567605a9732313652967 clamav-0.95.3.tar.gz | ||
| 68 | ======= | ||
| 69 | md5sums="38e7870db6e9ad0e569518499a6f3651 clamav-0.96.1.tar.gz | 66 | md5sums="38e7870db6e9ad0e569518499a6f3651 clamav-0.96.1.tar.gz |
| 70 | >>>>>>> e78cd26... main/clamav: upgrade to 0.96.1 | ||
| 71 | d64432c463850663c5041c3097f3e903 clamd.initd | 67 | d64432c463850663c5041c3097f3e903 clamd.initd |
| 72 | 567bc32b657dd7031b9b7beaa946203a clamd.confd | 68 | 567bc32b657dd7031b9b7beaa946203a clamd.confd |
| 73 | f4d1f415322905128dc27135566ad136 freshclam.initd | 69 | f4d1f415322905128dc27135566ad136 freshclam.initd |