diff options
| author | Daniel Lange <DLange@git.local> | 2020-11-15 14:32:41 +0100 |
|---|---|---|
| committer | Daniel Lange <DLange@git.local> | 2020-11-15 14:33:09 +0100 |
| commit | bb908f3dc4ac5847592e9698dec150658067e84e (patch) | |
| tree | fb0d7b03602de14f4ba6efbdd9f8a9f3cf7cc067 /Makefile.am | |
| parent | da2dcf9505299eae607e29cc85691b8163c1a36e (diff) | |
| parent | e7b95feee4f375738cb339a58337fdab83f6abbf (diff) | |
Resolve merge conflicts, merge #298 "Macro cleanup" from @BenBE
Diffstat (limited to 'Makefile.am')
0 files changed, 0 insertions, 0 deletions