Closed xperiandri closed 11 years ago
I appreciate the work here, but I can't merge these files as apparently you changed some of the files "new line" style, breaking completely the Diff... just check the Diff above and you'll see what I mean!
Sorry. What is the current line ending style in the project?
I've just looked at the diff and it is OK. In my request all line endings are Unix styled. Should be the same as in cimbalino/master
Seems I'm missing the .gitattributes file here... but check the GitHub Diff for your commits above, think that will help clear things out.
Yes, I accidentally changed style to Windows for some files and than back to Unix. So, how to deal with it so you will apply my pull request? Do you have any suggestions?
Yeah, a lot of work to fix it... but it's in now! :)
Thank you, @PedroLamas! Sorry for extra work, nevertheless this are useful changes.
No problem, and thank you for contributing! :)
Added CategoryAttribute to properties of actions and behaviors. Now everything is OK, you should not have any problems with merge.