Fix conflicts

This commit is contained in:
Adam Wathan 2017-11-10 09:41:52 -05:00
commit fd95c5d90f
98 changed files with 4059 additions and 5006 deletions

View file

@ -3,6 +3,7 @@ import defineClasses from '../util/defineClasses'
export default function() {
return defineClasses({
'cursor-auto': { cursor: 'auto' },
'cursor-default': { cursor: 'default' },
'cursor-pointer': { cursor: 'pointer' },
'cursor-not-allowed': { cursor: 'not-allowed' },
})