diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-12-07 17:25:42 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-12-07 17:25:42 +0100 |
| commit | 179c1366704aef3fad9d32fcffeee9da90737a7b (patch) | |
| tree | 9724b9ad776e92753baf2be3c365b3a5bf63b440 | |
| parent | 381c6cd1afe00ba6028bd899220e0d229dc35d92 (diff) | |
| download | alpine_aports-179c1366704aef3fad9d32fcffeee9da90737a7b.tar.bz2 alpine_aports-179c1366704aef3fad9d32fcffeee9da90737a7b.tar.xz alpine_aports-179c1366704aef3fad9d32fcffeee9da90737a7b.zip | |
commit/php7: fix merge error
forgot to git add
| -rw-r--r-- | community/php7/APKBUILD | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/community/php7/APKBUILD b/community/php7/APKBUILD index 5cb375748e..9303ea1616 100644 --- a/community/php7/APKBUILD +++ b/community/php7/APKBUILD | |||
| @@ -646,11 +646,7 @@ _mv() { | |||
| 646 | mv $@ | 646 | mv $@ |
| 647 | } | 647 | } |
| 648 | 648 | ||
| 649 | <<<<<<< HEAD | ||
| 650 | sha512sums="de1c22ee37cd0e6d1682091d9735f292cb5c6be653c5ce5771fdcd43522122dfebecab474fe2b29f94a757942513569916ebff59f3a8e63b6fc61830dabb3e47 php-7.2.10.tar.bz2 | ||
| 651 | ======= | ||
| 652 | sha512sums="95b9d09fec4af7df38736fabd291af5635a2caab9611c82a9a4988a849888f9847052ed69192c0f0b0103cf9d2888d5dd763471e1419d6e8da33ab77c9f95dbd php-7.2.13.tar.bz2 | 649 | sha512sums="95b9d09fec4af7df38736fabd291af5635a2caab9611c82a9a4988a849888f9847052ed69192c0f0b0103cf9d2888d5dd763471e1419d6e8da33ab77c9f95dbd php-7.2.13.tar.bz2 |
| 653 | >>>>>>> b951dbfe68... community/php7: security upgrade to 7.2.13 | ||
| 654 | 1c708de82d1086f272f484faf6cf6d087af7c31750cc2550b0b94ed723961b363f28a947b015b2dfc0765caea185a75f5d2c2f2b099c948b65c290924f606e4f php7-fpm.initd | 650 | 1c708de82d1086f272f484faf6cf6d087af7c31750cc2550b0b94ed723961b363f28a947b015b2dfc0765caea185a75f5d2c2f2b099c948b65c290924f606e4f php7-fpm.initd |
| 655 | cacce7bf789467ff40647b7319e3760c6c587218720538516e8d400baa75651f72165c4e28056cd0c1dc89efecb4d00d0d7823bed80b29136262c825ce816691 php7-fpm.logrotate | 651 | cacce7bf789467ff40647b7319e3760c6c587218720538516e8d400baa75651f72165c4e28056cd0c1dc89efecb4d00d0d7823bed80b29136262c825ce816691 php7-fpm.logrotate |
| 656 | 274bd7b0b2b7002fa84c779640af37b59258bb37b05cb7dd5c89452977d71807f628d91b523b5039608376d1f760f3425d165242ca75ee5129b2730e71c4e198 php7-module.conf | 652 | 274bd7b0b2b7002fa84c779640af37b59258bb37b05cb7dd5c89452977d71807f628d91b523b5039608376d1f760f3425d165242ca75ee5129b2730e71c4e198 php7-module.conf |