From a58b38da70fe249cbbe2e98bdfedf4acd9a87af9 Mon Sep 17 00:00:00 2001
From: Koushik M L N <koushik@itversity.in>
Date: Thu, 22 Nov 2018 19:34:51 +0530
Subject: [PATCH] Updated README.md

---
 README.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/README.md b/README.md
index a8a6234..c7040cb 100644
--- a/README.md
+++ b/README.md
@@ -16,15 +16,9 @@ time.
 
 ## Run on HTTP
 
-<<<<<<< HEAD
 ```bash
 wetty -p 3000
 ```
-=======
-*  `npm config set python python2.7` If you are using python3 as default
-
-*  `npm install`
->>>>>>> Modified ReadMe.md
 
 If you run it as root it will launch `/bin/login` (where you can specify the
 user name), else it will launch `ssh` and connect by default to `localhost`.