Commits

dustin smith  committed 890b425 Merge

README update

  • Participants
  • Parent commits f262e13, 1297486

Comments (0)

Files changed (1)

 
     java -cp stanford-corenlp-2010-11-12.jar:stanford-corenlp-models-2010-11-06.jar:xom-1.2.6.jar:xom.jar:jgraph.jar:jgrapht.jar -Xmx3g edu.stanford.nlp.pipeline.StanfordCoreNLP -props default.properties
 
+<<<<<<< HEAD
 You can reach me, Dustin Smith, by sending a message on GitHub or through email (contact information is available [on my webpage](http://web.media.mit.edu/~dustin)).
+=======
+You can reach me, Dustin Smith, by sending a message on GitHub or through email (contact information is available [on my webpage](http://web.media.mit.edu/~dustin).
+>>>>>>> 1297486a42f1ff858073c5411ec065b4d67419eb
 
 #  TODO