diff options
| author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-06-27 23:49:36 +0100 |
|---|---|---|
| committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-06-27 23:49:36 +0100 |
| commit | 3d7d8cedfe0698e895949027906ce5ca996aad17 (patch) | |
| tree | 108627d6dcb039ad340e75b1b14081524cc5a3df /.file-metadata | |
| parent | 57f922480d62a826b3e6030c81b85b412794fd4c (diff) | |
| parent | c151eddbcc5f4208b40dc3037a8ae8adb0ff9173 (diff) | |
Imported recent work in master, minor conflict fixed in paper.mk
Only two conflicts came up in the newly added comments of 'paper.mk' in the
Maneage branch. It happened because in this project we don't use
'pdflatex', but 'latex' alone.
Diffstat (limited to '.file-metadata')
| -rw-r--r-- | .file-metadata | bin | 9121 -> 9226 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/.file-metadata b/.file-metadata Binary files differindex 3a4122f..9c02981 100644 --- a/.file-metadata +++ b/.file-metadata |