www

commit 6ca087fbb3e831f167f85178924d40701b5a5a1f
parent dc4e8e23b113de90ac36252a489ec1d144c76d3c
Author: Georges Dupéron <jahvascriptmaniac+github@free.fr>
Date:   Tue, 24 May 2011 17:16:42 +0200

Correction du conflit laissé par John.

Diffstat:
M
presentation/presentation.tex
 | 
4
+---

1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/presentation/presentation.tex b/presentation/presentation.tex
@@ -183,7 +183,6 @@ Types de noeuds
 \end{frame}
 
 \begin{frame}
-<<<<<<< HEAD
 \begin{center}
 	\begin{tabular}{ | l | l | l | l | p{5cm} |}
         \hline
@@ -204,7 +203,7 @@ Types de noeuds
 \end{center}
 \end{frame}
 
-=======
+\begin{frame}
   \begin{figure}
     \pgfdeclarelayer{background}
     \pgfdeclarelayer{foreground}
@@ -244,7 +243,6 @@ Types de noeuds
     \end{tikzpicture}
   \end{figure}
 \end{frame}
->>>>>>> bffc88a4813d0c8b3230606bc4f3a4666f38198f
 
 \begin{frame}
   Pas de conflit de relations et la bonne catégorie grammaticale~: conditions nécessaires mais pas suffisantes