diff options
| author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2021-01-09 23:36:58 +0000 |
|---|---|---|
| committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2021-01-09 23:44:32 +0000 |
| commit | 55d6570aecc5f442399262b7faa441d16ccd4556 (patch) | |
| tree | 0e23073eadd7f5169b3ce38e829763a65e71b5cb /.gitattributes | |
| parent | e3f4be66020538e3ab641f91405b8c07582e5862 (diff) | |
| parent | d9a6855948fad17fa0fbc2017ab2be0238ca8b72 (diff) | |
Imported recent changes in Maneage, minor single conflict fixed
There was a single conflict in the comments of one part of 'configure.sh'
that has been fixed.
There was also a single place that needed to convert 'BDIR' to 'badir' in
this project (so after the merge, it also built easily).
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions