Fix typo

f79c0a7b · Martijn Vermaat · 3e2317b9 · f79c0a7b
Commit f79c0a7b authored Dec 02, 2015 by Martijn Vermaat
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

merging/merging.tex merging/merging.tex +1 -1

No files found.
--- a/merging/merging.tex
+++ b/merging/merging.tex
@@ -381,7 +381,7 @@ My favorite character is Milhouse.
  \end{lstlisting}
  \bigskip
  What we had is under \bt{HEAD}, what \bt{hue/master} had is above
-  \bt{hue/maser}.
+  \bt{hue/master}.
  \pause
  \bigskip
  \begin{lstlisting}