Skip to content

Commit b1e0efc

Browse files
authored
Resolve merge conflicts in README.md and README.en.md
1 parent 3076a9a commit b1e0efc

2 files changed

Lines changed: 2 additions & 14 deletions

File tree

README.en.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,9 @@ f'''[![build](https://github.com/python/python-docs-pl/actions/workflows/update-
1717
]]] -->
1818
[![build](https://github.com/python/python-docs-pl/actions/workflows/update-and-build.yml/badge.svg)](https://github.com/python/python-docs-pl/actions/workflows/update-and-build.yml)
1919
[![core 100.00%](https://img.shields.io/badge/core-100.00%25-0.svg)](https://translations.python.org/#pl)
20-
<<<<<<< HEAD
21-
[![Total Translation of Documentation](https://img.shields.io/badge/total_words-5.81%25-0.svg)](https://translations.python.org/#pl)
22-
[![Total Translation of Documentation](https://img.shields.io/badge/total_strings-12.65%25-0.svg)](https://translations.python.org/#pl)
23-
[![lint errors count](https://shields.io/badge/dynamic/xml?url=https%3A%2F%2Ftranslations.python.org%2Fbuild-details.html&query=%2F%2Ftr%5Btd%5B%40data-label%3D%27language%27%20and%20contains%28.%2C%20%27%28pl%29%27%29%5D%5D%20%20%20%2F%2Ftd%5B%40data-label%3D%27lint%27%5D%2Fa%2Ftext()&label=lint%20errors)](https://github.com/python/python-docs-pl/actions/workflows/lint.yml)
24-
=======
2520
[![Total Translation of Documentation](https://img.shields.io/badge/total_words-5.71%25-0.svg)](https://translations.python.org/#pl)
2621
[![Total Translation of Documentation](https://img.shields.io/badge/total_strings-12.49%25-0.svg)](https://translations.python.org/#pl)
27-
[![lint errors count](https://shields.io/badge/dynamic/xml?url=https%3A%2F%2Ftranslations.python.org%2Fbuild-details.html&query=%2F%2Ftr%5Btd%5B%40data-label%3D%27language%27%20and%20contains%28.%2C%20%27%28pl%29%27%29%5D%5D%20%20%20%2F%2Ftd%5B%40data-label%3D%27lint%27%5D%2Fa%2Ftext()&label=lint%20errors)](https://github.com/python/python-docs-pl/actions/workflows/update-lint-and-build.yml)
28-
>>>>>>> origin/3.15
22+
[![lint errors count](https://shields.io/badge/dynamic/xml?url=https%3A%2F%2Ftranslations.python.org%2Fbuild-details.html&query=%2F%2Ftr%5Btd%5B%40data-label%3D%27language%27%20and%20contains%28.%2C%20%27%28pl%29%27%29%5D%5D%20%20%20%2F%2Ftd%5B%40data-label%3D%27lint%27%5D%2Fa%2Ftext()&label=lint%20errors)](https://github.com/python/python-docs-pl/actions/workflows/lint.yml)
2923

3024
<!-- [[[end]]] -->
3125

README.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,9 @@ f'''[![build](https://github.com/python/python-docs-pl/actions/workflows/update-
1717
]]] -->
1818
[![build](https://github.com/python/python-docs-pl/actions/workflows/update-and-build.yml/badge.svg)](https://github.com/python/python-docs-pl/actions/workflows/update-lint-and-build.yml)
1919
[![podstawowe artykuły 100.00%](https://img.shields.io/badge/podstawowe_artykuły-100.00%25-0.svg)](https://translations.python.org/#pl)
20-
<<<<<<< HEAD
21-
[![postęp tłumaczenia całości dokumentacji](https://img.shields.io/badge/całość_słów-5.81%25-0.svg)](https://translations.python.org/#pl)
22-
[![postęp tłumaczenia całości dokumentacji](https://img.shields.io/badge/całość_napisów-12.65%25-0.svg)](https://translations.python.org/#pl)
23-
[![liczba błędów lintowania](https://shields.io/badge/dynamic/xml?url=https%3A%2F%2Ftranslations.python.org%2Fbuild-details.html&query=%2F%2Ftr%5Btd%5B%40data-label%3D%27language%27%20and%20contains%28.%2C%20%27%28pl%29%27%29%5D%5D%20%20%20%2F%2Ftd%5B%40data-label%3D%27lint%27%5D%2Fa%2Ftext()&label=b%C5%82%C4%99dy%20lintowania)](https://github.com/python/python-docs-pl/actions/workflows/lint.yml)
24-
=======
2520
[![postęp tłumaczenia całości dokumentacji](https://img.shields.io/badge/całość_słów-5.71%25-0.svg)](https://translations.python.org/#pl)
2621
[![postęp tłumaczenia całości dokumentacji](https://img.shields.io/badge/całość_napisów-12.49%25-0.svg)](https://translations.python.org/#pl)
27-
[![liczba błędów lintowania](https://shields.io/badge/dynamic/xml?url=https%3A%2F%2Ftranslations.python.org%2Fbuild-details.html&query=%2F%2Ftr%5Btd%5B%40data-label%3D%27language%27%20and%20contains%28.%2C%20%27%28pl%29%27%29%5D%5D%20%20%20%2F%2Ftd%5B%40data-label%3D%27lint%27%5D%2Fa%2Ftext()&label=b%C5%82%C4%99dy%20lintowania)](https://github.com/python/python-docs-pl/actions/workflows/update-lint-and-build.yml)
28-
>>>>>>> origin/3.15
22+
[![liczba błędów lintowania](https://shields.io/badge/dynamic/xml?url=https%3A%2F%2Ftranslations.python.org%2Fbuild-details.html&query=%2F%2Ftr%5Btd%5B%40data-label%3D%27language%27%20and%20contains%28.%2C%20%27%28pl%29%27%29%5D%5D%20%20%20%2F%2Ftd%5B%40data-label%3D%27lint%27%5D%2Fa%2Ftext()&label=b%C5%82%C4%99dy%20lintowania)](https://github.com/python/python-docs-pl/actions/workflows/lint.yml)
2923

3024
<!-- [[[end]]] -->
3125

0 commit comments

Comments
 (0)