From d6afb5285e35ccd896361a181bb89b52b37ef570 Mon Sep 17 00:00:00 2001
From: Andrew Davey <andrew@equin.co.uk>
Date: Fri, 10 Jan 2014 19:12:58 +0000
Subject: [PATCH] CSS column-count property is unitless

---
 src/dom/CSSProperty.js                          | 1 +
 src/dom/__tests__/CSSPropertyOperations-test.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/dom/CSSProperty.js b/src/dom/CSSProperty.js
index 507417ff3b..29b2befd39 100644
--- a/src/dom/CSSProperty.js
+++ b/src/dom/CSSProperty.js
@@ -22,6 +22,7 @@
  * CSS properties which accept numbers but are not in units of "px".
  */
 var isUnitlessNumber = {
+  columnCount: true,
   fillOpacity: true,
   flex: true,
   flexGrow: true,
diff --git a/src/dom/__tests__/CSSPropertyOperations-test.js b/src/dom/__tests__/CSSPropertyOperations-test.js
index ae09eff3ba..2612c85d2f 100644
--- a/src/dom/__tests__/CSSPropertyOperations-test.js
+++ b/src/dom/__tests__/CSSPropertyOperations-test.js
@@ -70,6 +70,7 @@ describe('CSSPropertyOperations', function() {
 
   it('should not append `px` to styles that might need a number', function() {
     var unitlessProperties = [
+      'columnCount',
       'fillOpacity',
       'flex',
       'flexGrow',