PR to fix submodule clash between branches #11

Merged
flip merged 3 commits from assignment1 into master 2023-05-12 09:08:49 +02:00
8 changed files with 26 additions and 9 deletions

2
.gitmodules vendored
View File

@@ -1,4 +1,4 @@
[submodule "latex-homework"]
path = assignments/latex-homework
path = assignments/template
url = https://github.com/gijs-pennings/latex-homework.git
branch = master

Binary file not shown.

View File

@@ -1,5 +1,6 @@
\documentclass{latex-homework/homework}
\documentclass{template/homework}
\usepackage{enumitem}
\usepackage{subfiles}
\title{MIT OCW Real Analysis}
@@ -8,5 +9,5 @@
\begin{document}
\maketitle
\subfile{week1/0.3.6.tex}
\subfile{week1/1.tex}
\end{document}

Binary file not shown.

View File

@@ -1,6 +0,0 @@
\documentclass[../main_text.tex]{subfiles}
\begin{document}
\exercise
\end{document}

BIN
assignments/week1/1.pdf Normal file

Binary file not shown.

22
assignments/week1/1.tex Normal file
View File

@@ -0,0 +1,22 @@
\documentclass[../main_text.tex]{subfiles}
\begin{document}
\exercise*[0.3.6]
\begin{enumerate}[label=\emph{\alph*)}]
\item Wanting to show:
$A \cap (B \cup C) = (A \cap B) \cup (A \cap C)$
In order to prove this equivalence, we have to prove the implication both ways. We use two lemmas for this.
\begin{lemma}[test]
$A \cap (B \cup C) \implies (A \cap B) \cup (A \cap C)$
Let $x \in A \cap (B \cup C)$.
\end{lemma}
\begin{definition}
Test.
\end{definition}
\item
\end{enumerate}
\end{document}