Merge branch 'continental' of tglx.de:/home/jan/git/schulung into jan

Conflicts:
	Makefile

Signed-off-by: Manuel Traut <manut@linutronix.de>

1 files changed, 0 insertions, 25 deletions

diff --git a/flash-memory/ubifs/pres_ubifs_de.tex b/flash-memory/ubifs/pres_ubifs_de.tex
deleted file mode 100644
index da11c8c..0000000
--- a/flash-memory/ubifs/pres_ubifs_de.tex
+++ /dev/null
@@ -1,25 +0,0 @@
-\documentclass{beamer}
-\usetheme{linutronix}
-\usepackage{german}
-\usepackage[utf8]{inputenc}
-\usepackage{pgf}
-\usepackage{graphicx}
-\usepackage{lxextras}
-
-\title{Block \lq Was ist Linux?\rq}
-\institute{Linutronix GmbH}
-
-\begin{document}
-
-\maketitle
-
-% ----- Slide ------------------
-\begin{frame}
-\begin{figure}[h]
-\centering
-%\includegraphics[width=8cm]{images/myimage.jpg}
-\end{figure}
-\end{frame}
-
-
-\end{document}