repositories
/
linuxnijmegen-ssh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of github.com:dopefishh/ssh-pres
[linuxnijmegen-ssh.git]
/
server.tex
diff --git
a/server.tex
b/server.tex
index
6806116
..
2597941
100644
(file)
--- a/
server.tex
+++ b/
server.tex
@@
-34,5
+34,6
@@
\item ...
\item \lstinline{$ man sshd_config}
\end{enumerate}
\item ...
\item \lstinline{$ man sshd_config}
\end{enumerate}
+>>>>>>> 045d7a2a20106057e9b1a2b7ce76c3ae174ab6b8
\end{block}
\end{frame}
\end{block}
\end{frame}