fixed merge bug

This commit is contained in:
John 2017-02-20 21:36:05 +01:00
parent b75cc076ca
commit ea43a4acd3

View File

@ -56,7 +56,7 @@
text width=55mm, text width=55mm,
inner sep=5mm, inner sep=5mm,
above left=35mm and 8mm of current page.south east, above left=35mm and 8mm of current page.south east,
font=\Huge\tt\bfseries, font=\Huge\ttfamily\bfseries,
]{% ]{%
\iffree% \iffree%
Free Software Edition Free Software Edition
@ -67,7 +67,7 @@
\end{tikzpicture} \end{tikzpicture}
\end{DSTitlePage} \end{DSTitlePage}
\DSFullImgPage[picturepuzzle,fg=IDpurple]{bilder/c64} %\DSFullImgPage[picturepuzzle,fg=IDpurple]{bilder/c64}
\begin{DSletters} \begin{DSletters}
\input{artikel/leserbriefe.tex} \input{artikel/leserbriefe.tex}
@ -76,8 +76,8 @@
\DSimpressum \DSimpressum
\begin{figure}[bh!] \begin{figure}[bh!]
\includegraphics[width=1\textwidth]{bilder/mightyjohn-cc-by-sa.jpg} % \includegraphics[width=1\textwidth]{bilder/mightyjohn-cc-by-sa.jpg}
\caption{mightyjohn warnt. cc-by-sa (via flickr)} % \caption{mightyjohn warnt. cc-by-sa (via flickr)}
\end{figure} \end{figure}
%aktuelle Schleuder %aktuelle Schleuder
@ -94,8 +94,8 @@
%\input{artikel/torbridges.tex} %\input{artikel/torbridges.tex}
% %
%% %%
\DSFullImgPage{bilder/datenspuren} %\DSFullImgPage{bilder/datenspuren}
\DSFullImgPage{bilder/tattoo} %\DSFullImgPage{bilder/tattoo}
\end{document} \end{document}