I have no clue what's going on

2020-01-06 09:54:17 -06:00
parent 7fb785bc35 5a5dcb797e
commit 3f1c213e85
2 changed files with 344 additions and 1 deletions
--- a/render.sh
+++ b/render.sh
@@ -31,4 +31,8 @@ cd ../book-4
 /usr/bin/pdflatex -file-line-error -interaction nonstopmode -jobname=Book4 "Main.tex"
 /usr/bin/pdflatex -file-line-error -interaction nonstopmode -jobname=Book4 "Main.tex"
 rm Book4.aux Book4.out Book4.toc
-mv Book4.pdf /home/david/fileshare/Anders/
+<<<<<<< HEAD
+mv Book4.pdf /home/david/fileshare/Anders/
+=======
+mv Book4.pdf /home/david/fileshare/Anders/
+>>>>>>> dev