From f9f3f38578cdcbc32247a65a957969dd8b27d855 Mon Sep 17 00:00:00 2001 From: Alexander Pushkov Date: Mon, 19 Jul 2021 18:08:33 +0300 Subject: [PATCH] Merge pull request #3783 from notpushkin/patch-1 Remove leftover merge conflict on the FAQ page --- docs/FAQ.md | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/docs/FAQ.md b/docs/FAQ.md index cfd41e1f9..4a4bf4233 100644 --- a/docs/FAQ.md +++ b/docs/FAQ.md @@ -28,7 +28,6 @@ - [What's the difference between code-server and Theia?](#whats-the-difference-between-code-server-and-theia) - [What's the difference between code-server and VS Code Codespaces?](#whats-the-difference-between-code-server-and-vs-code-codespaces) - [Does code-server have any security login validation?](#does-code-server-have-any-security-login-validation) -- [Enterprise](#enterprise) - [Are there community projects involving code-server?](#are-there-community-projects-involving-code-server) @@ -390,20 +389,12 @@ Codespaces web dashboard instead of connecting directly to it. On the other hand, code-server is free, open-source, and can be run on any machine with few limitations. -<<<<<<< HEAD - ## Does code-server have any security login validation? -code-server only supports a single password and limits logins to two per minute plus twelve per hour. - -## Enterprise - -======= +code-server supports setting a single password and limits logins to two per minute and twelve per hour. ## Are there community projects involving code-server? -> > > > > > > Edit code-server docs - Visit the [awesome-code-server](https://github.com/cdr/awesome-code-server) repository to view community projects and guides with code-server! Feel free to add your own!