From: mart <mart@lubbe.rs>
Date: Wed, 11 Nov 2015 08:58:35 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/dopefishh/tt2015
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=9d533c0f740c7f826b75286f309be9f7f3a3674d;p=tt2015.git

Merge branch 'master' of https://github.com/dopefishh/tt2015

Conflicts:
	a2/1cases.tex
---

9d533c0f740c7f826b75286f309be9f7f3a3674d
diff --cc a2/1cases.tex
index 71b630c,172ad03..18420a7
--- a/a2/1cases.tex
+++ b/a2/1cases.tex
@@@ -1,5 -1,5 +1,4 @@@
- \pagebreak
  \subsection{Preflight checklist}
 -
  Before actual certification is commenced we perform a manual test using a 
  checklist.
  If any of the checks fail we immediately reject the product.