Full rebase of Marco's changes
Compare changes
Files
2- Marco Ammon authored
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
+ 4
− 2
@@ -30,7 +31,7 @@ thesisPDF:
@@ -42,7 +43,8 @@ archlinuxRolling: