summaryrefslogtreecommitdiffstats
path: root/workshop.tex
diff options
context:
space:
mode:
Diffstat (limited to 'workshop.tex')
-rw-r--r--workshop.tex4
1 files changed, 4 insertions, 0 deletions
diff --git a/workshop.tex b/workshop.tex
index c798a16..d09f850 100644
--- a/workshop.tex
+++ b/workshop.tex
@@ -48,6 +48,10 @@
\end{frame}
\begin{frame}
+\includegraphics[width=\textwidth]{figures/commits.pdf}
+\end{frame}
+
+\begin{frame}
\begin{center}
\includegraphics[scale=.9]{figures/git-merge-conflict.pdf}
\end{center}