bugfix

diff --git a/Conferences/2014_EcoAc/Telemeta_EcoAcoustics_2014_06.tex b/Conferences/2014_EcoAc/Telemeta_EcoAcoustics_2014_06.tex
index d5fae919ce302cb80196a1d8019bd317c69dca1e..7e2be9f606336c18e47faedfe0d570f7fa91e418 100644 (file)
--- a/Conferences/2014_EcoAc/Telemeta_EcoAcoustics_2014_06.tex
+++ b/Conferences/2014_EcoAc/Telemeta_EcoAcoustics_2014_06.tex
@@ -320,7 +320,6 @@
 \end{frame}
 
 
-<<<<<<< HEAD
 \begin{frame}
   \frametitle{SABIOD: Scaled Acoustic Biodiversity (prototype)}
   \begin{center}