From 48d98f7ebd238211eedc5599b2de9f1ae01bc4ea Mon Sep 17 00:00:00 2001 From: Martin Carlberg Date: Tue, 20 Aug 2013 11:22:39 +0200 Subject: [PATCH] Fixed: Added theme attribute 'divider-thickness' to wrong class when doing manual merge. --- AppKit/CPTableHeaderView.j | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AppKit/CPTableHeaderView.j b/AppKit/CPTableHeaderView.j index ebffbd34d..098c71ee5 100644 --- a/AppKit/CPTableHeaderView.j +++ b/AppKit/CPTableHeaderView.j @@ -53,8 +53,7 @@ @"text-color": [CPNull null], @"font": [CPNull null], @"text-shadow-color": [CPNull null], - @"text-shadow-offset": CGSizeMakeZero(), - @"divider-thickness": 1.0 + @"text-shadow-offset": CGSizeMakeZero() }; } @@ -252,6 +251,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal return @{ @"background-color": [CPNull null], @"divider-color": [CPColor grayColor], + @"divider-thickness": 1.0 }; }