fixing permissions

2020-01-06 22:41:59 -06:00 · 2020-01-06 22:41:59 -06:00 · 06281e3e21
commit 06281e3e21
parent 5fff2a8fd2
20 changed files with 0 additions and 4 deletions
--- a/All4.tex
+++ b/All4.tex
--- a/book-1/Synopsis.md
+++ b/book-1/Synopsis.md
--- a/book-1/all.tex
+++ b/book-1/all.tex
--- a/book-1/background.jpg
+++ b/book-1/background.jpg
--- a/book-1/structure.tex
+++ b/book-1/structure.tex
--- a/book-2/1.tex
+++ b/book-2/1.tex
--- a/book-2/Main.tex
+++ b/book-2/Main.tex
--- a/book-2/all.tex
+++ b/book-2/all.tex
--- a/book-2/background.jpg
+++ b/book-2/background.jpg
--- a/book-2/structure.tex
+++ b/book-2/structure.tex
--- a/book-3/1.tex
+++ b/book-3/1.tex
--- a/book-3/Main.tex
+++ b/book-3/Main.tex
--- a/book-3/all.tex
+++ b/book-3/all.tex
--- a/book-3/structure.tex
+++ b/book-3/structure.tex
--- a/book-4/1.tex
+++ b/book-4/1.tex
--- a/book-4/Main.tex
+++ b/book-4/Main.tex
--- a/book-4/all.tex
+++ b/book-4/all.tex
--- a/book-4/structure.tex
+++ b/book-4/structure.tex
--- a/render.sh
+++ b/render.sh
@ -31,8 +31,4 @@ 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
-<<<<<<< HEAD
 mv Book4.pdf /home/david/fileshare/Anders/
-=======
-mv Book4.pdf /home/david/fileshare/Anders/
->>>>>>> dev
--- a/structure.tex
+++ b/structure.tex