search

Lasher09 / NLP

NLTK on Science Fiction
1 stars 2 forks source link

Chap4 code #31

Closed Lasher09 closed 10 years ago

Lasher09 commented 10 years ago

Here are my new code and User Stories. I only went to chapter 4 as beyond chapter 5 it gets pretty esoteric in parsing Grammar.

babykav commented 10 years ago

i think it looks good

ghost commented 10 years ago

Actually, there seems to be an issue. It can't be merged. My guess is that you weren't up to date before you committed these changes, so GitHub has changed from multiple people and it doesn't know which ones to use. I could be wrong, but I think if you save the file locally, then pull to make sure you are up to date and then make the changes it should work.

babykav commented 10 years ago

Jacob is right. Did you pull Oaks edits before you added your edits and pushed?