diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-09-06 15:44:48 +0100 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2019-09-06 15:44:48 +0100 |
| commit | e35c30ed4bb132cb20132c31cdabaebfce1b69bb (patch) | |
| tree | 776d059fb31c59bb65b785a95e0f751691005d6e /test_postgresql.sh | |
| parent | Merge branch 'dinsic' into babolivier/dinsic-3pid-invite (diff) | |
| download | synapse-e35c30ed4bb132cb20132c31cdabaebfce1b69bb.tar.xz | |
Fix bogus conflict resolution
Diffstat (limited to 'test_postgresql.sh')
0 files changed, 0 insertions, 0 deletions