INADA Naoki <songofaca...@gmail.com> added the comment:
It seems PR author removed his repository and the PR can't be merge via conflict. In master branch: 02:18 $ ll **/*.png -rw-r--r-- 1 inada-n staff 3732 7 1 02:13 faq/python-video-icon.png -rwxr-xr-x 1 inada-n staff 49648 7 1 02:09 howto/logging_flow.png* -rw-r--r-- 1 inada-n staff 24719 7 1 02:09 library/depgraph-output.png -rw-r--r-- 1 inada-n staff 11148 7 1 02:09 library/hashlib-blake2-tree.png -rw-r--r-- 1 inada-n staff 11280 7 1 02:09 library/pathlib-inheritance.png -rw-r--r-- 1 inada-n staff 45021 7 1 02:09 library/tulip_coro.png -rw-r--r-- 1 inada-n staff 39585 7 1 02:09 library/turtle-star.png -rw-r--r-- 1 inada-n staff 48994 7 1 02:13 using/win_installer.png In lossless_png branch: $ ll **/*.png -rw-r--r-- 1 inada-n staff 2791 7 1 02:28 faq/python-video-icon.png -rwxr-xr-x 1 inada-n staff 19351 7 1 02:28 howto/logging_flow.png* -rw-r--r-- 1 inada-n staff 11158 7 1 02:28 library/depgraph-output.png -rw-r--r-- 1 inada-n staff 10590 7 1 02:28 library/hashlib-blake2-tree.png -rw-r--r-- 1 inada-n staff 6168 7 1 02:28 library/pathlib-inheritance.png -rw-r--r-- 1 inada-n staff 33565 7 1 02:28 library/tulip_coro.png -rw-r--r-- 1 inada-n staff 29964 7 1 02:28 library/turtle-star.png -rw-r--r-- 1 inada-n staff 37942 7 1 02:28 using/win_installer.png ---------- nosy: +inada.naoki _______________________________________ Python tracker <rep...@bugs.python.org> <https://bugs.python.org/issue30660> _______________________________________ _______________________________________________ Python-bugs-list mailing list Unsubscribe: https://mail.python.org/mailman/options/python-bugs-list/archive%40mail-archive.com
