git.ucc.asn.au / matches / MCTX3420.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a089928 065c9fe)
Merge branch 'master' of github:szmoore/MCTX3420
authorSam Moore <[email protected]>
Fri, 1 Nov 2013 03:08:04 +0000 (11:08 +0800)
committerSam Moore <[email protected]>
Fri, 1 Nov 2013 03:08:04 +0000 (11:08 +0800)
Conflicts:
reports/final/chapters/Results.tex

Stupidly I used slightly different label names for the sections than their section names -_-

1  2 
reports/final/chapters/Results.tex patch | diff1 | diff2 | blob | history

diff --cc reports/final/chapters/Results.tex
Simple merge
Repository for MCTX3420 2013 Project, Team 4

UCC git Repository :: git.ucc.asn.au