diff options
| author | Stephane Caron <stephane.caron@ens.fr> | 2012-05-29 16:37:31 -0700 |
|---|---|---|
| committer | Stephane Caron <stephane.caron@ens.fr> | 2012-05-29 16:37:31 -0700 |
| commit | c82103531902bd098045c5715bc45ac21c2f2990 (patch) | |
| tree | 16108935b4da1f4002fc1b7f63f4117b0806a268 /workshop.tex | |
| parent | 0865a1b0e5f975d95cf570027fa5116b6ed8c7d2 (diff) | |
| download | git_workshop-c82103531902bd098045c5715bc45ac21c2f2990.tar.gz | |
Sample branch figure
Diffstat (limited to 'workshop.tex')
| -rw-r--r-- | workshop.tex | 4 |
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} |