diff options
author | Neil Johnson <neil@matrix.org> | 2019-01-30 10:28:08 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-30 10:28:08 +0000 |
commit | ee4df7fd7a8d4ce7732ded1736f52d200d645f25 (patch) | |
tree | 79dfebdef9ce6951a7f6e3b2b657a768ddf86ffc /tests/config/test_generate.py | |
parent | define room dispositions for use in exposing room capabilities (diff) | |
parent | Merge pull request #4486 from xperimental/workaround-4216 (diff) | |
download | synapse-ee4df7fd7a8d4ce7732ded1736f52d200d645f25.tar.xz |
Merge branch 'develop' into neilj/room_capabilities
Diffstat (limited to 'tests/config/test_generate.py')
-rw-r--r-- | tests/config/test_generate.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/config/test_generate.py b/tests/config/test_generate.py index b5ad99348d..795b4c298d 100644 --- a/tests/config/test_generate.py +++ b/tests/config/test_generate.py @@ -50,8 +50,6 @@ class ConfigGenerationTestCase(unittest.TestCase): "homeserver.yaml", "lemurs.win.log.config", "lemurs.win.signing.key", - "lemurs.win.tls.crt", - "lemurs.win.tls.key", ] ), set(os.listdir(self.dir)), |