Ctvrtecni upravy

[pan13-paper.git] / pan13-paper / pan13-notebook.bib

diff --git a/pan13-paper/pan13-notebook.bib b/pan13-paper/pan13-notebook.bib
index 59c4aa082237448f51861c2319e8ccdf33a5cbcb..204d2fcea2023069b652900d6638d7f0e101a337 100755 (executable)
--- a/pan13-paper/pan13-notebook.bib
+++ b/pan13-paper/pan13-notebook.bib
@@ -12,7 +12,6 @@
         YEAR               = {2012}\r
 }\r
 \r
-<<<<<<< HEAD
 @inproceedings{suchomel_kas_12,\r
   added-at = {2012-10-01T11:37:58.000+0200},\r
   author = {Suchomel, {\v S}imon and Kasprzak, Jan and Brandejs, Michal},\r
@@ -85,7 +84,8 @@
         TITLE              = {Crowdsourcing Interaction Logs to Understand Text Reuse from the Web},\r
         URL                = {},\r
         YEAR               = {2013}\r
-=======
+}\r
+\r
 @INPROCEEDINGS{Kasprzak2009a,\r
   AUTHOR =       "Jan Kasprzak and Michal Brandejs and Miroslav K\v{r}ipa\v{c}",\r
   TITLE =        "Finding Plagiarism by Evaluating Document Similarities",\r
@@ -124,5 +124,4 @@
   booktitle={CLEF (Online Working Notes/Labs/Workshop)},\r
   pages={1--8},\r
   year={2012}\r
->>>>>>> 2278ad058d0a6e0c2228741c76aece9ace432912
 }\r