From 68e85246993cb6bf2ef64ed14b4f791581c3ca6f Mon Sep 17 00:00:00 2001
From: Olivier BICHLER <olivier.bichler@cea.fr>
Date: Mon, 17 Feb 2025 16:14:00 +0100
Subject: [PATCH] Fixed bad merge
---
pyproject.toml | 5 -----
1 file changed, 5 deletions(-)
diff --git a/pyproject.toml b/pyproject.toml
index bf4155e..088200e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -9,7 +9,6 @@ readme = "README.md"
license = { file = "LICENSE" }
classifiers = [
"Development Status :: 2 - Pre-Alpha",
-<<<<<<< HEAD
"Intended Audience :: Developers",
"Intended Audience :: Education",
"Intended Audience :: Science/Research",
@@ -28,10 +27,6 @@ classifiers = [
"Topic :: Scientific/Engineering :: Artificial Intelligence",
"Topic :: Software Development"
]
-=======
- "Programming Language :: Python :: 3"
- ]
->>>>>>> 22e47ad9fb629f85ed4f1c5fa981c1d195c0201b
dynamic = ["version"] #Â defined by pbr
[build-system]
--
GitLab