gamerson/liferay-ide — pull request #12 by kameshsampath (2011-10-29 01:46:20+00:00)
Title: Ide 355

Greg,

I tried resolving the conflicts that i happened to encounter when doing a pull --rebase, though the conflict were for all the files that i had updated during my last commit, so i tend to replace the remote ones with mine.
Can you please pull and see if i managed to merge correctly, if yes then please merge with the config-editors branch of yours.

PS: Excuse me if the line endings are not right, first time tried to do a merge with GIT, have my own suspicion that line endings could be wrong for the merged files.