diff options
| author | zlg <zlg@zlg.space> | 2019-01-27 16:28:07 -0800 |
|---|---|---|
| committer | zlg <zlg@zlg.space> | 2019-01-27 16:28:07 -0800 |
| commit | affa94487faef5b2f5af62e76b8b0625633c4ca3 (patch) | |
| tree | 4558848477698792035e4087c70c553eb85d419c /user | |
| parent | 493adf3bf3defbe1cbe8ab511b4154777cf345fa (diff) | |
| download | packages-affa94487faef5b2f5af62e76b8b0625633c4ca3.tar.gz packages-affa94487faef5b2f5af62e76b8b0625633c4ca3.tar.bz2 packages-affa94487faef5b2f5af62e76b8b0625633c4ca3.tar.xz packages-affa94487faef5b2f5af62e76b8b0625633c4ca3.zip | |
user/py3-tz: correct incomplete stash pop
Diffstat (limited to 'user')
| -rw-r--r-- | user/py3-tz/APKBUILD | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/user/py3-tz/APKBUILD b/user/py3-tz/APKBUILD index acc48d6ea..d8182670c 100644 --- a/user/py3-tz/APKBUILD +++ b/user/py3-tz/APKBUILD @@ -28,11 +28,6 @@ package() { cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } - -<<<<<<< Updated upstream -sha512sums="49cd9ed0b4b0959bab59c91ac1ced36b28ab0fa097002ab1d45daa0e7f962c43de2e0b9228344d9b1f8aa4dc2f3b02d51f41a3ed7e6af8c51fc2eec7aace5b48 pytz-2018.7.tar.gz -======= sha512sums="c3dabe61d04539245761a5c4e3bfb614df1c3b8ccc2ffa1cf320c5ad642242c29b3321fe7855d32a2ae55c739acbbe8c0e1813df5b3c757b8f56fff910fee159 pytz-2018.9.tar.gz ->>>>>>> Stashed changes be61b829014be0d0d7db0c544481d378a95324c1f5968cbbcd7887c6ee8ce52a0b47ae734e16fc5fb2429d8d49c8ef199b6b3b7194f9e654699bb73ab8f3a10d zoneinfo-noinstall.patch a09467dbb00c1ab9f7e7527d9b020a6d913b8da2380a5359e782f27ccf9ec4dd4f50bfc92c95dc2e793904242c8139793c15e78e651d2777fb3b3abc48fcd640 zoneinfo-fix.patch" |