diff options
| author | Urbain Vaes <urbain@vaes.uk> | 2014-12-18 11:24:57 +0000 |
|---|---|---|
| committer | Urbain Vaes <urbain@vaes.uk> | 2014-12-18 11:24:57 +0000 |
| commit | fddba9c7230fd55c0399b7fc4acf757a9aadc2e6 (patch) | |
| tree | eea5ecf3855baf48af16d6f9d11ea7d05179aa72 /header.tex | |
| parent | 136db20338f8bad9083fd5bf9512c5742727a985 (diff) | |
| parent | d54ed015135d0b287c37c0a0dd76e4d3fd646549 (diff) | |
solving merge conflict
Diffstat (limited to 'header.tex')
0 files changed, 0 insertions, 0 deletions