Add instances.jl file in test.

Azzaare · Azzaare · commit ac6c57e1c7ad · 2021-03-25T18:54:52.000+09:00
diff --git a/test/instances.jl b/test/instances.jl
@@ -40,6 +40,7 @@ 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"]
 
@@ -68,3 +69,5 @@ standard_free_energy = [
     -26.662
     -22.179
 ]
+=======
+>>>>>>> Add instances.jl file in test.

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ 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`
`43`	`44`
`44`	`45`	`compounds_names = ["H", "H₂", "H₂O", "N", "N₂", "NH", "NO", "O", "O₂", "OH"]`
`45`	`46`
`@@ -68,3 +69,5 @@ standard_free_energy = [`
`68`	`69`	`-26.662`
`69`	`70`	`-22.179`
`70`	`71`	`]`
	`72`	`+=======`
	`73`	`+>>>>>>> Add instances.jl file in test.`