Skip to content

Commit 44c6d77

Browse files
committed
fix merge conflict
2 parents 4c47b34 + 5a19c77 commit 44c6d77

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

dpti/hti_liq.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
def make_iter_name(iter_index):
2828
return "task_hti." + ("%04d" % iter_index)
2929

30+
3031
def parse_lj_sigma_epsilon(ret, sparam, hybrid=False):
3132
element_num = sparam.get("element_num", 1)
3233
sigma_key_index_ = filter(

0 commit comments

Comments
 (0)