From 61ed18c12cb14a8cecee3ab4b747458dedf5812d Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 16 Jun 2014 03:03:32 +0200
Subject: [PATCH] bugfix

---
 Conferences/2014_EcoAc/Telemeta_EcoAcoustics_2014_06.tex | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Conferences/2014_EcoAc/Telemeta_EcoAcoustics_2014_06.tex b/Conferences/2014_EcoAc/Telemeta_EcoAcoustics_2014_06.tex
index d5fae91..7e2be9f 100644
--- 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}
-- 
2.39.5