Update doc, publish 0.3.0 to PyPi

xgouchet · Jan 18, 2018 · 22f11b0 · 22f11b0
1 parent 3e1b29a
commit 22f11b0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/docs/known_merge_tools.rst b/docs/known_merge_tools.rst
@@ -90,10 +90,22 @@ JavaImports (``java_imports``)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 This tool will handle any conflict within the imports section of your
-java files.
+Java files.
 
 You can add the following options :
 
 -  **mergetool.java\_imports.order** : specify the way to order imports.
    Presets include Android Studio : ``android``; IntelliJ Idea :
    ``idea``; and Eclipse : ``eclipse``
+
+KotlinImports (``kotlin_imports_beta``)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+This tool (still in βeta) will handle any conflict within the imports section of your
+Kotlin files.
+
+You can add the following options :
+
+-  **mergetool.java\_imports.order** : specify the way to order imports.
+   Presets include Android Studio : ``android``; and IntelliJ Idea :
+   ``idea``
diff --git a/setup.py b/setup.py
@@ -16,7 +16,7 @@
 
 setup(
     name='automergetool',
-    version='0.2.0',
+    version='0.3.0',
     description='A tool to simplify the process of solving conflicts after a git merge, rebase or cherry-pick.',
     long_description=readme,
     author='Xavier F. Gouchet',