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
Showing only changes of commit 756c7feddf - Show all commits

2
.gitmodules vendored
View File

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

View File

@@ -1,4 +1,4 @@
\documentclass{latex-homework/homework} \documentclass{template/homework}
\usepackage{enumitem} \usepackage{enumitem}
\usepackage{subfiles} \usepackage{subfiles}