Fix conflict

TheNavigat · TheNavigat · commit 2ade27905f35 · 2015-08-31T16:19:09.000+02:00
diff --git a/test/chrome/script.py b/test/chrome/script.py
@@ -58,11 +58,7 @@ class bcolors:
 
 if driver.current_url.startswith('https'):
 	print bcolors.OKGREEN + "HTTP to HTTPS redirection successful" + bcolors.ENDC
-<<<<<<< HEAD
-elif(driver.current_url.startswith('http')):
-=======
 elif driver.current_url.startswith('http'):
->>>>>>> e2235f1058f8475d981eef393a6991b116c40e5d
 	print bcolors.FAIL + "HTTP to HTTPS redirection failed" + bcolors.ENDC
 	sys.exit(1)
 
