diff options
| author | Gian Demarmels <gian@demarmels.org> | 2022-02-04 16:50:32 +0100 |
|---|---|---|
| committer | Gian Demarmels <gian@demarmels.org> | 2022-02-04 16:50:32 +0100 |
| commit | a67786078bb3617ea8d4d308b21781fd0a1c2258 (patch) | |
| tree | 67d476fe3e096001997f6de77d1db92bcd643bbb /contrib | |
| parent | 8674f32aec8113ced6b2c2be625728b31158fff8 (diff) | |
| download | exchange-a67786078bb3617ea8d4d308b21781fd0a1c2258.tar.gz exchange-a67786078bb3617ea8d4d308b21781fd0a1c2258.tar.bz2 exchange-a67786078bb3617ea8d4d308b21781fd0a1c2258.zip | |
resolves merge conflicts
Diffstat (limited to 'contrib')
| m--------- | contrib/gana | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/contrib/gana b/contrib/gana -Subproject c12314df0f82e192c6829a9c6cf3e9663b586da +Subproject 6b74d0faa173bbb220cdd82dcf3915dadd241e1 |