fixes conflicts for real this time

Author: RettBehrens

docs/v1/accounting/index.html

@@ -48,9 +48,5 @@ def read_file(filename):
     keywords="xero python sdk API oAuth",
     name="xero_python",
     packages=find_packages(include=["xero_python", "xero_python.*"]),
-<<<<<<< HEAD
     version="1.8.0",
-=======
-    version="1.7.0",
->>>>>>> master
 )

setup.py

@@ -2,8 +2,4 @@
 
 __author__ = """Xero Developer API"""
 __email__ = "[email protected]"
-<<<<<<< HEAD
 __version__ = "1.8.0"
-=======
-__version__ = "1.7.0"
->>>>>>> master

xero_python/__init__.py

@@ -10,11 +10,7 @@
 """
 
 """
-<<<<<<< HEAD
     OpenAPI spec version: 2.13.4
-=======
-    OpenAPI spec version: 2.13.2
->>>>>>> master
 """
 
 import importlib

xero_python/accounting/api/accounting_api.py

@@ -10,11 +10,7 @@
 """
 
 """
-<<<<<<< HEAD
     OpenAPI spec version: 2.13.4
-=======
-    OpenAPI spec version: 2.13.2
->>>>>>> master
 """
 
 import importlib

xero_python/assets/api/asset_api.py

@@ -3,13 +3,8 @@ These endpoints are related to managing authentication tokens and identity for X
 
 The `xero_python` package is automatically generated by the [XeroAPI SDK 2.0 Codegen](https://github.com/xero-github/xeroapi-sdk-codegen) project:
 
-<<<<<<< HEAD
 - API version: 2.13.4
 - Package version: 1.8.0
-=======
-- API version: 2.13.2
-- Package version: 1.7.0
->>>>>>> master
 - Build package: org.openapitools.codegen.languages.PythonClientCodegen
 For more information, please visit [https://developer.xero.com](https://developer.xero.com)