zd

.vscode/extensions.json

@@ -0,0 +1,6 @@
+{
+    "recommendations": [
+        "tht13.python",
+        "donjayamanne.python-extension-pack"
+    ]
+}

.vscode/tasks.json

@@ -0,0 +1,12 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "echo",
+            "type": "shell",
+            "command": "echo Hello"
+        }
+    ]
+}

setup.py

@@ -3,6 +3,7 @@
 from os import path
 
 here = path.abspath(path.dirname(__file__))
+<<<<<<< ours
 try:
     with open("README.md", "r") as fh:
         long_description = fh.read()
@@ -12,11 +13,20 @@
 setup(
     name='alpha_vantage',
     version='2.3.1',
+=======
+with open(path.join(here, 'README.md'), encoding='utf-8') as f:
+    long_description = f.read()
+
+setup(
+    name='alpha_vantage',
+    version='0.1.6',
+>>>>>>> theirs
     author='Romel J. Torres',
     author_email='romel.torres@gmail.com',
     license='MIT',
     description='Python module to get stock data from the Alpha Vantage Api',
     long_description=long_description,
+<<<<<<< ours
     long_description_content_type="text/markdown",
     classifiers=[
         'Development Status :: 5 - Production/Stable',
@@ -31,6 +41,9 @@
         'Programming Language :: Python :: 3.8'
     ],
     url='https://github.com/RomelTorres/alpha_vantage',
+=======
+    url = 'https://github.com/RomelTorres/alpha_vantage',
+>>>>>>> theirs
     install_requires=[
         'aiohttp',
         'requests'
@@ -44,10 +57,17 @@
         'pandas': ['pandas'],
     },
     keywords=['stocks', 'market', 'finance', 'alpha_vantage', 'quotes',
+<<<<<<< ours
               'shares'],
     packages=find_packages(
         exclude=['helpers', 'test_alpha_vantage', 'images']),
     package_data={
         'alpha_vantage': [],
+=======
+    'shares'],
+    packages= find_packages(exclude=['helpers','test_alpha_vantage', 'images']),
+    package_data={
+        'alpha_vantage':[],
+>>>>>>> theirs
     }
 )