search

devongovett / atom-jade

Jade TextMate bundle converted for Atom
51 stars 26 forks source link

Fixed highlighting of key/value attributes with whitespace before = #67

Open jseppy opened 8 years ago

jseppy commented 8 years ago

Resolves #14. Fixed highlighting of key/value attributes with more than one character of whitespace before the equal sign.

LinusU commented 8 years ago

Could you please resolve the conflict? Thanks!

jseppy commented 8 years ago

Ok, that should be fixed. Sorry, first time using git, still getting used to it.

LinusU commented 8 years ago

Something still seems wrong, if you look at "Changes" you'll see that it touches too many files, including package.json...

jseppy commented 8 years ago

Aren't those changes from the release? Looking at the changes just from each individual commit after the comment to resolve the conflict, I see only jade.cson being changed. It seems the other changes are historical in the context of this pull request. Checking a diff of this pull request and the master shows just a single line in jade.cson changing.

7dee1ac shows the change being fixed, but accidentally leaving in the conflict notations. 2dc2b8c shows the conflict notations being removed. 742076b shows no changes at all.

But I could just be confused by git.