summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-01-30 11:14:33 +0000
committerErik Johnston <erik@matrix.org>2015-01-30 11:14:33 +0000
commit2c9e136d5721d1797e153268f4562c27887a6201 (patch)
tree8befee5ce84393b2a928ce909e2fa28ab1a09282 /synapse
parentMerge branch 'develop' of github.com:matrix-org/synapse into rejections (diff)
downloadsynapse-2c9e136d5721d1797e153268f4562c27887a6201.tar.xz
Fix bad merge fo python_dependencies.py
Diffstat (limited to 'synapse')
-rw-r--r--synapse/python_dependencies.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
index ba9308803c..4182ad990f 100644
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@@ -6,7 +6,6 @@ logger = logging.getLogger(__name__)
 REQUIREMENTS = {
     "syutil==0.0.2": ["syutil"],
     "matrix_angular_sdk==0.6.0": ["syweb>=0.6.0"],
-    "matrix_angular_sdk>=0.6.0": ["syweb>=0.6.0"],
     "Twisted>=14.0.0": ["twisted>=14.0.0"],
     "service_identity>=1.0.0": ["service_identity>=1.0.0"],
     "pyopenssl>=0.14": ["OpenSSL>=0.14"],