Fixed merge conflict

Because i didn't pull..

Author: Seluj78

README.rst

@@ -45,7 +45,7 @@ translations from a bunch of file to other files.
 
 
 `padpo <https://pypi.org/project/padpo/>`_
-----------------------------------------
+------------------------------------------
 
 Linter for gettext files (``*.po``) including Grammalecte,
 non-breakable space checks, glossary checks etc ...

setup.cfg

@@ -1,7 +1,7 @@
 [metadata]
 name = poutils
 url = https://github.com/afpy/poutils
-version = 0.10.1
+version = 0.12.1
 description = Gettext related tools: spellcheck, line wrapping etc...
 long_description = file: README.rst
 keywords = poutils, gettext, powrap, pospell, pogrep, potodo, pomerge, padpo
@@ -19,9 +19,9 @@ classifiers =
 zip_safe = True
 include_package_data = True
 install_requires =
-    powrap==0.3.3
+    powrap==0.4.0
     pospell==1.0.11
     pogrep==0.1.2
     potodo==0.19.2
     pomerge==0.1.4
-    padpo==0.9.0
+    padpo==0.10.0