Skip to content

Commit

Permalink
resolve merge issue
Browse files Browse the repository at this point in the history
  • Loading branch information
fgrunewald committed Aug 15, 2024
1 parent 313e952 commit d4712e0
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion polyply/src/gen_ff.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ def gen_ff(itppath, smile_str, outpath, inpath=[], res_charges=None):
# don't overwrite existing blocks
if name in force_field.blocks:
continue

Check warning on line 103 in polyply/src/gen_ff.py

View check run for this annotation

Codecov / codecov/patch

polyply/src/gen_ff.py#L103

Added line #L103 was not covered by tests
new_block = extract_block(target_mol, list(fragment.nodes), defines={})
new_block = extract_block(target_mol, fragment, defines={})
nx.set_node_attributes(new_block, 1, "resid")
new_block.nrexcl = target_mol.nrexcl
force_field.blocks[name] = new_block
Expand Down

0 comments on commit d4712e0

Please sign in to comment.