summaryrefslogtreecommitdiff
path: root/src/select/properties/column_count.c
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2014-12-20 11:46:47 +0000
committerMichael Drake <tlsa@netsurf-browser.org>2014-12-20 11:46:47 +0000
commit3eb5209c42d45458c34e554cef6a626f0326b511 (patch)
treedee0ead88f759c8dfce209c42b58eabd7345985f /src/select/properties/column_count.c
parentdee446280575217e81fdf2787e231ba92113c403 (diff)
parent78c9527819b6acbf4d3826383eaa328780170b48 (diff)
downloadlibcss-3eb5209c42d45458c34e554cef6a626f0326b511.tar.gz
libcss-3eb5209c42d45458c34e554cef6a626f0326b511.tar.bz2
Merge branch 'master' of git://git.netsurf-browser.org/libcss
Diffstat (limited to 'src/select/properties/column_count.c')
-rw-r--r--src/select/properties/column_count.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/select/properties/column_count.c b/src/select/properties/column_count.c
index ecee5f3..92fdec2 100644
--- a/src/select/properties/column_count.c
+++ b/src/select/properties/column_count.c
@@ -63,7 +63,7 @@ css_error css__compose_column_count(const css_computed_style *parent,
type == CSS_COLUMN_COUNT_INHERIT ||
(child->uncommon != NULL && result != child)) {
if ((child->uncommon == NULL && parent->uncommon != NULL) ||
- type == CSS_OUTLINE_COLOR_INHERIT) {
+ type == CSS_COLUMN_COUNT_INHERIT) {
type = get_column_count(parent, &count);
}