Skip to content

Commit

Permalink
Merge branch 'subsystems-airthermo' into staging
Browse files Browse the repository at this point in the history
  • Loading branch information
JLefebvre55 committed May 24, 2022
2 parents 5d65325 + 7711478 commit 50a4ef5
Show file tree
Hide file tree
Showing 49 changed files with 14,608 additions and 1,964 deletions.
Binary file modified docs/archive/dsfc-phase1/designreport/DesignReport.pdf
Binary file not shown.
4 changes: 2 additions & 2 deletions docs/archive/dsfc-phase1/designreport/DesignReport.tex
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
\documentclass{report}
\documentclass{../../../tex/report}
\usepackage{setspace} % Setting line spacing
\usepackage{ulem} % Underline
\usepackage{caption} % Captioning figures
Expand Down Expand Up @@ -36,7 +36,7 @@
Primary Written Deliverable for the Deep Space Food Challenge Phase 1

\vfill
\input{../../tex/Namecard.tex}
\input{../../../tex/Namecard.tex}
\vspace{.75cm}

Revision 1.0\\
Expand Down
Binary file modified docs/finalreport/FinalReport.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/finalreport/FinalReport.tex
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
\documentclass{report}
\documentclass{../tex/report}
\usepackage{setspace} % Setting line spacing
\usepackage{ulem} % Underline
\usepackage{caption} % Captioning figures
Expand Down
248 changes: 0 additions & 248 deletions docs/finalreport/report.cls

This file was deleted.

Binary file modified docs/progressreport/ProgressReport.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/progressreport/ProgressReport.tex
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
\documentclass{report}
\documentclass{../tex/report}
\usepackage{setspace} % Setting line spacing
\usepackage{ulem} % Underline
\usepackage{caption} % Captioning figures
Expand Down
Loading

0 comments on commit 50a4ef5

Please sign in to comment.