oops

diff --git a/Conferences/2014_EcoAc/Telemeta_EcoAcoustics_2014_06.tex b/Conferences/2014_EcoAc/Telemeta_EcoAcoustics_2014_06.tex
index c9e8bc77ec5f067648408fd0f7b816a80522aa07..d5fae919ce302cb80196a1d8019bd317c69dca1e 100644 (file)
--- a/Conferences/2014_EcoAc/Telemeta_EcoAcoustics_2014_06.tex
+++ b/Conferences/2014_EcoAc/Telemeta_EcoAcoustics_2014_06.tex
@@ -393,11 +393,8 @@
 }
 
 
-\section{Development}
-=======
 
 \section{Conclusion}
->>>>>>> tmp
 \frame{\tableofcontents[currentsection]}
 
 \subsection{Current development}
@@ -412,28 +409,8 @@
 \end{block}
 }
 
-<<<<<<< HEAD
-
-\frame{\frametitle{Development - Lessons}
-\begin{block}{Lessons from a 7 year old project}
-\begin{itemize}
-\item Simplicity is better than complexity (KISS principle)
-\item Modularity is only accessible with a flexible language (thanks Python!)
-\item Models and Objects are more important than Technologies
-\item A good workflow is defined by the users themselves through feedback and constant revisions
-\item Prototyping is a crucial part of the development process
-\item A good platform relies on standards, not on formats
-\item The Open Source ecosystem gives some \textbf{tremendous} possibilities to develop, deploy and scale any platform project
-\end{itemize}
-\end{block}
-}
-
-
-\frame{\frametitle{Development - TODO list}
-=======
 \frame{\frametitle{Current development}
 \footnotesize
->>>>>>> tmp
 \begin{block}{Telemeta}
     \begin{itemize}
     %\item Update code to support Django new Class based views