Auto resolve conflict by keeping our changes

box · Sep 11, 2024 · aabbe04 · aabbe04
2 parents a5aeb8b + 3d881ac
commit aabbe04
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/setup.py b/setup.py
@@ -24,7 +24,6 @@ def main():
         version=__version__,
         description='Official Box Python Generated SDK',
         url='https://github.com/box/box-python-sdk-gen.git',
-        licence='Apache-2.0, http://www.apache.org/licenses/LICENSE-2.0',
         author='Box',
         long_description_content_type='text/markdown',
         long_description=open(