settings.tex · 7ab629088536597f9176c472012077fc6c4f78c6 · Sofia Öhman / liuthesis · GitLab

Apr 25, 2017
7ef8cfac
Merge branch 'master' of gitlab.ida.liu.se:olale55/liuthesis · 7ef8cfac
Ola Leifler authored Apr 25, 2017
```
Conflicts:
	demo_student_thesis.tex
	liuthesis.cls
	settings.tex
```
7ef8cfac
Merge branch 'master' of gitlab.ida.liu.se:olale55/liuthesis
Ola Leifler authored Apr 25, 2017
```
Conflicts:
	demo_student_thesis.tex
	liuthesis.cls
	settings.tex
```