search

cimbalino / Cimbalino-Phone-Toolkit

Cimbalino Windows Phone Toolkit
MIT License
78 stars 32 forks source link

Added CategoryAttribute to properties of actions and behaviors #17

Closed xperiandri closed 11 years ago

xperiandri commented 11 years ago

Added CategoryAttribute to properties of actions and behaviors. Now everything is OK, you should not have any problems with merge.

pedrolamas commented 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!

xperiandri commented 11 years ago

Sorry. What is the current line ending style in the project?

xperiandri commented 11 years ago

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

pedrolamas commented 11 years ago

Seems I'm missing the .gitattributes file here... but check the GitHub Diff for your commits above, think that will help clear things out.

xperiandri commented 11 years ago

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?

pedrolamas commented 11 years ago

Yeah, a lot of work to fix it... but it's in now! :)

xperiandri commented 11 years ago

Thank you, @PedroLamas! Sorry for extra work, nevertheless this are useful changes.

pedrolamas commented 11 years ago

No problem, and thank you for contributing! :)