Instance problem commented (temp fix)

Azzaare · Azzaare · commit 659b510d6c8f · 2021-03-25T18:54:52.000+09:00
diff --git a/test/instances.jl b/test/instances.jl
@@ -40,9 +40,8 @@ qap_distances = [
     4  4  3  3  6  7  6  5  5  7  0  9
     6  7  6  6  7  5  7  3  2  7  9  0
 ]
-<<<<<<< HEAD
 
-compounds_names = ["H", "H₂", "H₂O", "N", "N₂", "NH", "NO", "O", "O₂", "OH"]
+# compounds_names = ["H", "H₂", "H₂O", "N", "N₂", "NH", "NO", "O", "O₂", "OH"]
 
 atoms_compounds = [
     1 0 0
@@ -69,5 +68,3 @@ standard_free_energy = [
     -26.662
     -22.179
 ]
-=======
->>>>>>> Add instances.jl file in test.

Original file line number	Diff line number	Diff line change
`@@ -40,9 +40,8 @@ qap_distances = [`
`40`	`40`	`4 4 3 3 6 7 6 5 5 7 0 9`
`41`	`41`	`6 7 6 6 7 5 7 3 2 7 9 0`
`42`	`42`	`]`
`43`		`-<<<<<<< HEAD`
`44`	`43`
`45`		`-compounds_names = ["H", "H₂", "H₂O", "N", "N₂", "NH", "NO", "O", "O₂", "OH"]`
	`44`	`+# compounds_names = ["H", "H₂", "H₂O", "N", "N₂", "NH", "NO", "O", "O₂", "OH"]`
`46`	`45`
`47`	`46`	`atoms_compounds = [`
`48`	`47`	`1 0 0`
`@@ -69,5 +68,3 @@ standard_free_energy = [`
`69`	`68`	`-26.662`
`70`	`69`	`-22.179`
`71`	`70`	`]`
`72`		`-=======`
`73`		`->>>>>>> Add instances.jl file in test.`