Skip to content

Commit 03710cc

Browse files
committed
Remove rogue git conflict lines in R_Recombination/NIST.py
1 parent cc056ed commit 03710cc

1 file changed

Lines changed: 0 additions & 6 deletions

File tree

  • input/kinetics/families/R_Recombination

input/kinetics/families/R_Recombination/NIST.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8420,7 +8420,6 @@
84208420
)
84218421

84228422
entry(
8423-
<<<<<<< HEAD
84248423
index = 148,
84258424
label = "2004LI/KAZ7671-7680:12",
84268425
reactant1 =
@@ -8547,8 +8546,6 @@
85478546
)
85488547

85498548
entry(
8550-
=======
8551-
>>>>>>> GreenGroup/master
85528549
index = 150,
85538550
label = "2004LI/KAZ7671-7680:14",
85548551
reactant1 =
@@ -8610,7 +8607,6 @@
86108607
)
86118608

86128609
entry(
8613-
<<<<<<< HEAD
86148610
index = 151,
86158611
label = "2004LI/KAZ7671-7680:9",
86168612
reactant1 =
@@ -8863,8 +8859,6 @@
88638859
)
88648860

88658861
entry(
8866-
=======
8867-
>>>>>>> GreenGroup/master
88688862
index = 155,
88698863
label = "2004TSA456-465:2",
88708864
reactant1 =

0 commit comments

Comments
 (0)