From 6c6a35507e8a6675bd34affc1070e0342ef6d7c3 Mon Sep 17 00:00:00 2001
From: Mart Lubbers <mart@martlubbers.net>
Date: Tue, 8 Jul 2014 15:33:33 +0200
Subject: [PATCH] fixed merge conflicts and small addings

---
 conf.tex   |  8 ++++++++
 intro.tex  | 13 +++++++------
 samen.tex  |  0
 server.tex |  1 -
 truuk.tex  |  2 ++
 5 files changed, 17 insertions(+), 7 deletions(-)
 delete mode 100644 samen.tex

diff --git a/conf.tex b/conf.tex
index f37ceaf..7d37cf4 100644
--- a/conf.tex
+++ b/conf.tex
@@ -1,5 +1,6 @@
 \begin{frame}[fragile]
 	\frametitle{Gebruikersniveau}
+	\pause
 	\begin{lstlisting}
 Host nas
     HostName 192.168.0.102
@@ -24,3 +25,10 @@ Host muziekserver
     AddressFamily inet
 	\end{lstlisting}
 \end{frame}
+
+\begin{frame}
+	\frametitle{Systeemniveau}
+	\pause
+	/etc/ssh/ssh\_config
+\end{frame}
+
diff --git a/intro.tex b/intro.tex
index f6e3d57..6b78426 100644
--- a/intro.tex
+++ b/intro.tex
@@ -1,29 +1,30 @@
 \begin{frame}
 	\frametitle{Introductie}
-<<<<<<< HEAD
 	\begin{block}{Waarom}
 		\begin{enumerate}
-				\pause
+			\pause
 			\item{veiligheid \footnote{mits goed gebruikt}}
-				\pause
+			\pause
 			\item{beschikbaarheid}
-				\pause
+			\pause
 			\item{cross platform}
 		\end{enumerate}
 	\end{block}
 	En natuurlijk al de handige truukjes die je er mee uit kunt halen...
-=======
 	\begin{block}{Wat is SSH}
 			\pause
 			\begin{enumerate}
+					\pause
 					\item remote shell
+					\pause
 					\item x forwarding
+					\pause
 					\item port forwarding
+					\pause
 					\item ...
 			\end{enumerate}
 	\end{block}
 	\pause
 	\begin{block}{Versleuteling}
 	\end{block}
->>>>>>> 045d7a2a20106057e9b1a2b7ce76c3ae174ab6b8
 \end{frame}
diff --git a/samen.tex b/samen.tex
deleted file mode 100644
index e69de29..0000000
diff --git a/server.tex b/server.tex
index 2597941..6806116 100644
--- a/server.tex
+++ b/server.tex
@@ -34,6 +34,5 @@
 			\item ...
 			\item \lstinline{$ man sshd_config}
 		\end{enumerate}
->>>>>>> 045d7a2a20106057e9b1a2b7ce76c3ae174ab6b8
 	\end{block}
 \end{frame}
diff --git a/truuk.tex b/truuk.tex
index d7e6f07..66048dd 100644
--- a/truuk.tex
+++ b/truuk.tex
@@ -78,12 +78,14 @@ d5DgKnWxgJPHnDjmwqTeX3A5S34m/qJKK67IF9WqedeHxeMKzMZYcZpcsFxdvHk/
 
 \begin{frame}[fragile]
 	\frametitle{Public key authentication}
+	\pause
 	\begin{block}{\textasciitilde/.ssh/authorized\_keys}
 		\begin{lstlisting}
 option1="option1value",option2="option2value"...optionn="optionnvalue" ssh-rsa\
 AAAB4N.....
 		\end{lstlisting}
 	\end{block}
+	\pause
 	\begin{block}{Merk op}
 		alles in \textasciitilde/.ssh/ moet alleen leesbaar zijn voor de user. 
 		\lstinline{chmod 600} dus
-- 
2.20.1