From 542cea8688aa93aa2ca8dafb09bd91b5c05affd3 Mon Sep 17 00:00:00 2001 From: Thomas Koch Date: Wed, 10 Aug 2016 13:37:55 +0200 Subject: [PATCH] updated faq.md removed merge conflict tags --- commandline/WSL/faq.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/commandline/WSL/faq.md b/commandline/WSL/faq.md index a6b71a5a..26eb600c 100644 --- a/commandline/WSL/faq.md +++ b/commandline/WSL/faq.md @@ -168,7 +168,6 @@ To turn off legacy console: 1. Right click title bar -> Properties -> Uncheck Use legacy console 1. Click OK -<<<<<<< HEAD ### How do I change the display language of WSL? WSL install will try to automatically change the Ubuntu locale to match the locale of your Windows install. If you do not want this behavior you can run this command to change the Ubuntu locale after install completes. You will have to relaunch bash.exe for this change to take effect. @@ -176,7 +175,7 @@ The below example changes to locale to en-US:
``` BASH sudo update-locale LANG=en_US.UTF8 ``` -======= + ### Why do I get a Permission Denied error when using ping? Administrator privileges in Windows are required to run Ping in WSL. To run ping run Bash on Unbutu on Windows as an administrator, or run bash.exe from a CMD / PowerShell prompt with administrator privileges. @@ -189,8 +188,6 @@ Some users have reported issues with specific firewall applications blocking int In some cases turning off the firewall allows for access. In some cases simply having the firewall installed looks to block access. ->>>>>>> master - ### Where can I provide feedback? You can share feedback and ask questions through multiple channels: