Unsaved fixes in pyproject

FAIRmat-NFDI · Nov 7, 2024 · ef6ed19 · ef6ed19
1 parent 5c306f5
commit ef6ed19
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -132,13 +132,7 @@ where = ["src"]
 
 [project.entry-points.'nomad.plugin']
 perovskite_solar_cell = "perovskite_solar_cell_database:perovskite_solar_cell"
-<<<<<<< HEAD
 solar_cell_app = "perovskite_solar_cell_database.apps:solar_cells"
 perovskite_composition = "perovskite_solar_cell_database:perovskite_composition"
 ion_parser = "perovskite_solar_cell_database:ion_parser"
 llm_extraction_schema = "perovskite_solar_cell_database:llm_extraction_schema"
-=======
-llm_extraction_schema = "perovskite_solar_cell_database:llm_extraction_schema"
-solar_cell_app = "perovskite_solar_cell_database.apps:solar_cells"
-llm_extracted_solar_cells = "perovskite_solar_cell_database.apps:llm_extracted_solar_cells"
->>>>>>> Draft of app for the extracted entries