X-Git-Url: https://git.martlubbers.net/?p=linuxnijmegen-ssh.git;a=blobdiff_plain;f=server.tex;h=259794186274182be63ac204e132df49517d31c5;hp=6806116adc6ad2a20e9594608bbfea6babcc6948;hb=e089f81414c5d661914480e8ec0de354b1b93b33;hpb=045d7a2a20106057e9b1a2b7ce76c3ae174ab6b8

diff --git a/server.tex b/server.tex
index 6806116..2597941 100644
--- a/server.tex
+++ b/server.tex
@@ -34,5 +34,6 @@
 			\item ...
 			\item \lstinline{$ man sshd_config}
 		\end{enumerate}
+>>>>>>> 045d7a2a20106057e9b1a2b7ce76c3ae174ab6b8
 	\end{block}
 \end{frame}