BuggleInc / PLM

Programmer's Learning Machine
http://people.irisa.fr/Martin.Quinson/Teaching/PLM/
Other
63 stars 40 forks source link

Plm baseball #516

Closed JulesCohonner closed 6 years ago

JulesCohonner commented 6 years ago

What's new?

What's wrong?

mquinson commented 6 years ago

Hello,

something went wrong with this pull request, as it cannot be applied to the main source. Could you please fix this up? I'm also suprised because your diff contains a very large amount of things. I would have said that only baseball things must be changed here...

Thanks in advance, Mt.

mquinson commented 6 years ago

Not sufficient :) There is still conflicts :) The easiest would probably that you send me the files per email. I guess that I only need the baseball files, don't you think? Another possibility is that you create another branch from the trunk, and copy your files in it. After that, you do another, clean, pull request.

Thanks in advance, Mt

mquinson commented 6 years ago

Thanks, that's integrated now.