schedule

iit-cs429 · Dec 15, 2015 · 5e906bc · 5e906bc
2 parents 4ea1c36 + 52ebca4
commit 5e906bc
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/Schedule.md b/Schedule.md
@@ -35,6 +35,7 @@
 | 4/14  | Web search overview              | [Ch19](http://nlp.stanford.edu/IR-book/pdf/19web.pdf)  | 
 | 4/19  | PageRank                         | [Ch21](http://nlp.stanford.edu/IR-book/pdf/21link.pdf) | [A5](../assignments/assignment5)     
 | 4/21  | PageRank                         | [Ch21](http://nlp.stanford.edu/IR-book/pdf/21link.pdf) | |  [L26](../lectures/lec26)
+<<<<<<< HEAD:Schedule.md
 | 4/26  | Web Crawling                     | [Ch20](http://nlp.stanford.edu/IR-book/pdf/20crawl.pdf)| 
 | 4/28  | Review                          |                                                | [A6](../assignments/assignment6)
 | TBA  | **Final Exam**                           |                                                |