OpenRCE
diff --git a/‎Makefile
+2-4 b/‎Makefile
+2-4
diff --git a/‎Makefile.mine
-7 b/‎Makefile.mine
-7
diff --git a/‎Makefile.r102
-4 b/‎Makefile.r102
-4
diff --git a/‎Makefile.r86
-6 b/‎Makefile.r86
-6
@@ -1,9 +1,7 @@
+
+#LATEX_FILE=render.presentation
 LATEX_FILE=render.article
 
 all:
-<<<<<<< .mine
 	rm ${LATEX_FILE}.{toc,aux,log,nav,out,pdf,snm}; pdflatex ${LATEX_FILE}.tex && pdflatex ${LATEX_FILE}.tex
 
-=======
-	rm ${LATEX_FILE}.{toc,aux,log,nav,out,pdf,snm,vrb} 2>/dev/null; pdflatex ${LATEX_FILE}.tex && pdflatex ${LATEX_FILE}.tex; rm ${LATEX_FILE}.{toc,aux,log,nav,out,snm,vrb} 2>/dev/null;
->>>>>>> .r102