Merge branch 'master' of https://whale.am28.uni-tuebingen.de/git/raab/GP2023_chirp_detection

poster/main.tex

@@ -23,7 +23,10 @@ blockverticalspace=2mm, colspace=20mm, subcolspace=0mm]{tikzposter} %Default val
     with single - or physically separated - individuals.
     \begin{tikzfigure}[]
         \label{griddrawing}
+<<<<<<< HEAD
+=======
         \includegraphics[width=0.8\linewidth]{figs/introplot}
+>>>>>>> cdcf9564df07914cf57225de5a8bdaa642fbad0e
     \end{tikzfigure}
 }
 \myblock[TranspBlock]{Chirp detection}{
@@ -43,10 +46,10 @@ blockverticalspace=2mm, colspace=20mm, subcolspace=0mm]{tikzposter} %Default val
     \noindent
     \begin{itemize}
         \setlength\itemsep{0.5em}
-        \item Two fish compete for one hidding place in one tank, 
+        \item Two fish compete for one hidding place in one tank,
         \item Experiment had a 3 hour long darkphase and a 3 hour long light phase.
     \end{itemize}
-    
+
     \noindent
     \begin{minipage}[c]{0.7\linewidth}
         \begin{tikzfigure}[]
@@ -57,8 +60,8 @@ blockverticalspace=2mm, colspace=20mm, subcolspace=0mm]{tikzposter} %Default val
     \begin{minipage}[c]{0.2\linewidth}
         \begin{itemize}
             \setlength\itemsep{0.5em}
-            \item Fish who won the competition chirped more often than the fish who lost. 
-            \item 
+            \item Fish who won the competition chirped more often than the fish who lost.
+            \item
         \end{itemize}
     \end{minipage}
 }