Merge remote-tracking branch 'origin/master'

[idea/community.git] / platform / util / resources / misc / registry.properties

diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties
index 9aa874adf40f8b93be50e3e9eb4ea62bd185a52a..dce52875ef91d63fdd9efc195c541a6403ba396b 100644 (file)
--- a/platform/util/resources/misc/registry.properties
+++ b/platform/util/resources/misc/registry.properties
@@ -595,4 +595,6 @@ welcome.screen.project.grouping.enabled.description=Allows to group recent proje
 custom.folding.max.lookup.depth=50
 custom.folding.max.lookup.depth.description=Max lookup depth for custom folding comments in a PSI tree.
 
-tests_view_inline_statistics=true
\ No newline at end of file
+tests_view_inline_statistics=true
+
+tfs.set.connection.timeout=false