Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Remove leftover merge conflict on the FAQ page #3783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
code-asher merged 3 commits into coder:main from notpushkin:patch-1
Jul 19, 2021
Merged

Remove leftover merge conflict on the FAQ page #3783

code-asher merged 3 commits into coder:main from notpushkin:patch-1
Jul 19, 2021

Conversation

Copy link
Contributor

@notpushkin notpushkin commented Jul 15, 2021 •
edited
Loading

@notpushkin notpushkin requested a review from a team as a code owner July 15, 2021 09:40
@notpushkin notpushkin changed the title (削除) Remove leftover merge conflict (削除ここまで) (追記) Remove leftover merge conflict on the FAQ page (追記ここまで) Jul 15, 2021
Copy link
Member

@code-asher code-asher left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for finding this!

I think we want to keep the Does code-server have any security login validation section but we can remove Enterprise (it will also need to be removed in the table of contents at the top).

jsjoeio reacted with thumbs up emoji
@jawnsy jawnsy self-requested a review July 17, 2021 15:15 
Co-authored-by: Jonathan Yu <jawnsy@cpan.org>
@code-asher code-asher merged commit f9f3f38 into coder:main Jul 19, 2021
@notpushkin notpushkin deleted the patch-1 branch July 21, 2021 12:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@code-asher code-asher Awaiting requested review from code-asher

@jawnsy jawnsy Awaiting requested review from jawnsy

1 more reviewer

@khorne3 khorne3 khorne3 left review comments

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

AltStyle によって変換されたページ (->オリジナル) /