Closed amiryonatan closed 9 years ago
@amiryonatan Can you please ensure you have the latest downstream so I can automatically merge the latest code in and if possible make the requested changes.
Hey,
I pulled the latest version, and fixed all the remarks mentioned above. I'm not sure why it says there are conflicts and I don't know how to see them.
Thanks
Thanks, when I have conflicts I use https://code.google.com/p/tortoisegit/ to resolve conflicts. It's a nice easy to use ui.
Your changes look good thanks! Is there any chance you can resolve the conflicts and then I'll merge this pull request.
Can you please review these changes. I think it would make it a lot cleaner and would be a great pr :)