Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Bugfix: Mergable documentation
  • Loading branch information
pylover committed Nov 26, 2020
1 parent 3f3e22b commit 75de3ea
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 9 deletions.
2 changes: 1 addition & 1 deletion pymlconf/__init__.py
Expand Up @@ -6,4 +6,4 @@
ConfigurationNotInitializedError


__version__ = '2.6.0'
__version__ = '2.6.1'
4 changes: 2 additions & 2 deletions pymlconf/models.py
Expand Up @@ -84,8 +84,8 @@ def make_mergable_if_possible(cls, data, context):
def merge(self, *args):
"""Merge this instance with new instances, in-place.
:param *args: Configuration values to merge with current instance.
:type *args: iterable
:param args: Configuration values to merge with current instance.
:type args: iterable
"""
for data in args:
Expand Down
8 changes: 2 additions & 6 deletions sphinx/index.rst
Expand Up @@ -9,12 +9,8 @@ Welcome to pymlconf's documentation!
.. image:: http://img.shields.io/pypi/v/pymlconf.svg
:target: https://pypi.python.org/pypi/pymlconf

.. image:: https://requires.io/github/pylover/pymlconf/requirements.svg?branch=master
:target: https://requires.io/github/pylover/pymlconf/requirements/?branch=master
:alt: Requirements Status

.. image:: https://travis-ci.org/pylover/pymlconf.svg?branch=master
:target: https://travis-ci.org/pylover/pymlconf
.. image:: https://github.com/pylover/pymlconf/workflows/Build/badge.svg?branch=master
:target: https://github.com/pylover/pymlconf/actions

.. image:: https://coveralls.io/repos/github/pylover/pymlconf/badge.svg?branch=master
:target: https://coveralls.io/github/pylover/pymlconf?branch=master
Expand Down

0 comments on commit 75de3ea

Please sign in to comment.