Merge fix

Author: python273

setup.py

@@ -12,11 +12,7 @@
 from distutils.core import setup
 setup(
     name='vk_api',
-<<<<<<< HEAD
-    version='4.7.6',
-=======
     version='5.0.0',
->>>>>>> refs/remotes/origin/dev
     author='Kirill Python',
     author_email='siberianpython@gmail.com',
     url='https://github.com/python273/vk_api',

vk_api/__init__.py

@@ -9,11 +9,7 @@
 """
 
 __author__ = 'Kirill Python'
-<<<<<<< HEAD
-__version__ = '4.7.6'
-=======
 __version__ = '5.0.0'
->>>>>>> refs/remotes/origin/dev
 __email__ = 'siberianpython@gmail.com'
 __contact__ = 'https://vk.com/python273'
 

vk_api/vk_api.py

@@ -143,18 +143,8 @@ def security_check(self, url=None, response=None):
             if 'security_check' not in response.url:
                 return
 
-<<<<<<< HEAD
-        phone_prefix = regexp(r'phone_number">(.*?)<',
-                              response.text)
-        phone_prefix = phone_prefix[0].strip()
-
-        phone_postfix = regexp(r'phone_postfix">(.*?)<',
-                               response.text)
-        phone_postfix = phone_postfix[0].strip()
-=======
         phone_prefix = search_re(RE_PHONE_PREFIX, response.text).strip()
         phone_postfix = search_re(RE_PHONE_POSTFIX, response.text).strip()
->>>>>>> refs/remotes/origin/dev
 
         if self.number:
             code = code_from_number(phone_prefix, phone_postfix, self.number)