missing conflicts

diff --git a/librarian/pdf/wl.cls b/librarian/pdf/wl.cls
index e0721d9..cb605a1 100644 (file)
--- a/librarian/pdf/wl.cls
+++ b/librarian/pdf/wl.cls
@@ -154,20 +154,12 @@ Letters={SmallCaps,UppercaseSmallCaps}
 \fancyhf{}
 \renewcommand{\headrulewidth}{0pt}
 \renewcommand{\footrulewidth}{0pt}
-<<<<<<< HEAD
+
 %\lfoot{{\footnotesize \textsc{\@author} \emph{\@title}}}
 \cfoot{}
 %\rfoot{{\footnotesize \thepage}}
 \fancyfoot[LO,RE]{{\footnotesize \textsc{\@author} \emph{\@title}}}
 \fancyfoot[LE,RO]{{\footnotesize \thepage}}
-=======
-%\lfoot{{\footnotesize \textsc{\@author} \emph{\@title}}} %1
-\cfoot{}
-%\rfoot{{\footnotesize \thepage}}  %1
-\fancyfoot[LO,RE]{{\footnotesize \textsc{\@author} \emph{\@title}}}
-\fancyfoot[LE,RO]{{\footnotesize \thepage}}
-
->>>>>>> 4531d8a... nicer tables
 
 \clubpenalty=100000
 \widowpenalty=100000
@@ -185,14 +177,10 @@ Letters={SmallCaps,UppercaseSmallCaps}
 \raisebox{0pt}[0pt][0pt]{\makebox[0pt][r]{\usebox{\xglyphbox}}}}
 
 \newcommand{\makecover}[2]{
-<<<<<<< HEAD
+
 
         %\pdfpagewidth=#1
         %\pdfpageheight=#2
-=======
-%        \pdfpagewidth=#1
-%        \pdfpageheight=#2
->>>>>>> 4531d8a... nicer tables
 
         \thispagestyle{empty}
         \newlength{\PictHOffset}
@@ -207,21 +195,13 @@ Letters={SmallCaps,UppercaseSmallCaps}
         \addtolength{\PictVOffset}{\headheight}
         \addtolength{\PictVOffset}{\headsep}
         \addtolength{\PictVOffset}{\topskip}
-<<<<<<< HEAD
+
         \addtolength{\PictVOffset}{-#2}
 
         \noindent\hspace*{-\PictHOffset}%
         \raisebox{\PictVOffset}[0pt][0pt]{\makebox[0pt][l]{%
             \includegraphics[height=#2,width=#1]{cover.jpg}}}
         %\clearpage
-=======
-        \addtolength{\PictVOffset}{-#2} %1 \pdfpageheight}
-
-        \noindent\hspace*{-\PictHOffset}%
-        \raisebox{\PictVOffset}[0pt][0pt]{\makebox[0pt][l]{%
-            \includegraphics[height=#2,width=#1]{cover.png}}}
-%        \clearpage
->>>>>>> 4531d8a... nicer tables
         \vspace{#2}
 
         \hspace{-36mm}\parbox{16cm}{
@@ -234,7 +214,6 @@ Letters={SmallCaps,UppercaseSmallCaps}
             A collection of texts from a crowd-funded contest.
         }}
 
-<<<<<<< HEAD
 
         \vspace{8em}
 
@@ -245,18 +224,6 @@ Letters={SmallCaps,UppercaseSmallCaps}
 
         %\setlength{\pdfpagewidth}{210mm}
         %\setlength{\pdfpageheight}{297mm}
-=======
-
-        \vspace{8em}
-
-\emph{\thankyou}\\
-\indent\emph{You made this book possible.}
-        }
-
-
-%        \setlength{\pdfpagewidth}{210mm}
-%        \setlength{\pdfpageheight}{297mm}
->>>>>>> 4531d8a... nicer tables
 }
 
 
@@ -289,13 +256,6 @@ Letters={SmallCaps,UppercaseSmallCaps}
     }
 }
 
-<<<<<<< HEAD
-=======
-
-
-
-
->>>>>>> 4531d8a... nicer tables
 \usepackage{printlen}
 
 \newcommand{\editorialsection}{
@@ -340,12 +300,9 @@ Modern Poland Foundation Team
 
 \href{http://nowoczesnapolska.org.pl/}{http://nowoczesnapolska.org.pl/}
 
-<<<<<<< HEAD
 %\vspace{4em}
 %\box{\tableofcontents}
 
-=======
->>>>>>> 4531d8a... nicer tables
   \begin{figure}[b!]
   {
     \footnotesize