X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=pan13-paper%2Fpan13-notebook.bib;h=204d2fcea2023069b652900d6638d7f0e101a337;hb=ab24ba815bdf84d55df641c0d03d4dc93ad0453e;hp=59c4aa082237448f51861c2319e8ccdf33a5cbcb;hpb=eafe3e22e26382588563ac39d6f88dd022c740da;p=pan13-paper.git

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