Allow mergeCell to be passed in to Alignments.

Resolves #463
gleeda · Jun 22, 2015 · 640cfc2 · 640cfc2
1 parent 1c4a532
commit 640cfc2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/doc/source/changes.rst b/doc/source/changes.rst
@@ -1,3 +1,13 @@
+2.2.5 (unreleased)
+==================
+
+
+Bug fixes
+---------
+
+* `#463 <https://bitbucket.org/openpyxl/openpyxl/issue/463>`_ Unexpected keyword "mergeCell"
+
+
 2.2.4 (2015-06-17)
 ==================
 

diff --git a/openpyxl/styles/alignment.py b/openpyxl/styles/alignment.py
@@ -46,7 +46,7 @@ class Alignment(HashableObject):
     def __init__(self, horizontal=None, vertical=None,
                  textRotation=0, wrapText=None, shrinkToFit=None, indent=0, relativeIndent=0,
                  justifyLastLine=None, readingOrder=0, text_rotation=None,
-                 wrap_text=None, shrink_to_fit=None) :
+                 wrap_text=None, shrink_to_fit=None, mergeCell=None):
         self.horizontal = horizontal
         self.vertical = vertical
         self.indent = indent
@@ -63,6 +63,7 @@ def __init__(self, horizontal=None, vertical=None,
         if shrink_to_fit is not None:
             shrinkToFit = shrink_to_fit
         self.shrinkToFit = shrinkToFit
+        # mergeCell is vestigial
 
 
     def __iter__(self):