search

TransferORM / transfer

ColdFusion ORM library created by Mark Mandel, updated by @ghidinelli
Other
5 stars 3 forks source link

fix some bad merges #3

Closed seancoyne closed 10 years ago

seancoyne commented 10 years ago

turns out I can create pull request.

this should fix those bad merges.

ghidinelli commented 10 years ago

Got it - I missed that when I was resolving conflicts - thanks!

seancoyne commented 10 years ago

OK, i updated it. I grabbed the javaloader.cfc from your commit here 074bcd343d29102280e4057e800808d64183369a

That should be the right version as you don't appear to have made any other changes after that (except for the bad merge info).

The other javaloader.cfc is only whitespace changes (probably line endings if I had to guess). You can either pull those in or not.