Skip to content

Commit 100fa65

Browse files
[clean] bad commit
1 parent 97299c5 commit 100fa65

File tree

1 file changed

+0
-10
lines changed

1 file changed

+0
-10
lines changed

src/libeq/data_structure.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -687,20 +687,10 @@ def load_from_pyes(cls, pyes_data: str | dict) -> "SolverData":
687687
weights = "calculated"
688688
elif potentiometry_data["weightsMode"] == 2:
689689
weights = "given"
690-
<<<<<<< HEAD
691690

692-
breakpoint()
693-
ncomps = len(data['components'])
694-
c0flags=([Flags.REFINE if v else Flags.CONSTANT
695-
for v in g]
696-
if g else ncomps*[Flags.CONSTANT]
697-
for g in potentiometry_data["conc_refine_flags"])
698-
=======
699-
#breakpoint()
700691
c0flags=([Flags.REFINE if v else Flags.CONSTANT
701692
for v in g]
702693
for g in zip(*potentiometry_data["conc_refine_flags"]))
703-
>>>>>>> parent of 5155466 ([fix] for when c0flags is empty)
704694

705695
for t in potentiometry_data["titrations"]:
706696
titrations.append(

0 commit comments

Comments
 (0)