mohitrajain
diff --git a/‎.gitignore
+1 b/‎.gitignore
+1
diff --git a/‎ftp_client.py
-1 b/‎ftp_client.py
-1
diff --git a/‎glastopf.py
+1-1 b/‎glastopf.py
+1-1
diff --git a/‎kippo/detect.py
-45 b/‎kippo/detect.py
-45
diff --git a/‎venv/bin/activate
-78 b/‎venv/bin/activate
-78
diff --git a/‎venv/bin/activate.csh
-36 b/‎venv/bin/activate.csh
-36
diff --git a/‎venv/bin/activate.fish
-76 b/‎venv/bin/activate.fish
-76
diff --git a/‎venv/bin/activate_this.py
-34 b/‎venv/bin/activate_this.py
-34
diff --git a/‎venv/bin/chardetect
-11 b/‎venv/bin/chardetect
-11
diff --git a/‎venv/bin/easy_install
-11 b/‎venv/bin/easy_install
-11
diff --git a/‎venv/bin/easy_install-2.7
-11 b/‎venv/bin/easy_install-2.7
-11
diff --git a/‎venv/bin/pip
-11 b/‎venv/bin/pip
-11
diff --git a/‎venv/bin/pip2
-11 b/‎venv/bin/pip2
-11
diff --git a/‎venv/bin/pip2.7
-11 b/‎venv/bin/pip2.7
-11
diff --git a/‎venv/bin/python
-1 b/‎venv/bin/python
-1
@@ -0,0 +1 @@
+.idea/*
@@ -14,7 +14,6 @@ def check(cmd):
     global ftp
     print(ftp.sendcmd(cmd))
 
-<<<<<<< HEAD
 print(ftp.getwelcome())
 ftp.login()
 try:
 
@@ -48,4 +48,4 @@
     # Is a honeypot most probably ...
     score+=2
 
-print("honeyscore: " + str(score))
+print("honeyscore: " + str(score))