Skip to content
Snippets Groups Projects
Commit 68e85246 authored by Olivier BICHLER's avatar Olivier BICHLER
Browse files

Fixed bad merge

parent ba6d6d8b
Branches improvements lsq_unit_test
No related tags found
2 merge requests!54Update 0.3.1 -> 0.4.0,!36Global Quantization Improvements
Pipeline #65518 passed
Stage: static_analysis
    Stage: build
      Stage: test
        Stage: coverage
          Hide whitespace changes
          Inline Side-by-side
          Showing
          with 0 additions and 5 deletions
          pyproject.toml
          + 0
          − 5
          View file @ 68e85246
          ...@@ -9,7 +9,6 @@ readme = "README.md" ...@@ -9,7 +9,6 @@ readme = "README.md"
          license = { file = "LICENSE" } license = { file = "LICENSE" }
          classifiers = [ classifiers = [
          "Development Status :: 2 - Pre-Alpha", "Development Status :: 2 - Pre-Alpha",
          <<<<<<< HEAD
          "Intended Audience :: Developers", "Intended Audience :: Developers",
          "Intended Audience :: Education", "Intended Audience :: Education",
          "Intended Audience :: Science/Research", "Intended Audience :: Science/Research",
          ...@@ -28,10 +27,6 @@ classifiers = [ ...@@ -28,10 +27,6 @@ classifiers = [
          "Topic :: Scientific/Engineering :: Artificial Intelligence", "Topic :: Scientific/Engineering :: Artificial Intelligence",
          "Topic :: Software Development" "Topic :: Software Development"
          ] ]
          =======
          "Programming Language :: Python :: 3"
          ]
          >>>>>>> 22e47ad9fb629f85ed4f1c5fa981c1d195c0201b
          dynamic = ["version"] # defined by pbr dynamic = ["version"] # defined by pbr
          [build-system] [build-system]
          ......
          0% or .
          You are about to add 0 people to the discussion. Proceed with caution.
          Finish editing this message first!
          Please register or to comment

          Copyright © Eclipse Foundation, Inc. All Rights Reserved.     Privacy Policy | Terms of Use | Copyright Agent