Deleted the merge markers

aman26kbm · aman26kbm · commit f34efa8400dc · 2021-06-01T21:11:54.000-05:00
diff --git a/doc/src/z_references.bib b/doc/src/z_references.bib
@@ -415,8 +415,6 @@ @ARTICLE{murray_micro_symbiflow
 	number={},
 	pages={1-1}
 }
-<<<<<<< HEAD
-=======
 
 @inproceedings{koios_benchmarks,
   title={Koios: A Deep Learning Benchmark Suite for FPGA Architecture and CAD Research},
@@ -425,4 +423,3 @@ @inproceedings{koios_benchmarks
   year={2021}
 }
 
->>>>>>> ca872deda... Dummy change to create a new commit for all files to be PR'ed

Original file line number	Diff line number	Diff line change
`@@ -415,8 +415,6 @@ @ARTICLE{murray_micro_symbiflow`
`415`	`415`	`number={},`
`416`	`416`	`pages={1-1}`
`417`	`417`	`}`
`418`		`-<<<<<<< HEAD`
`419`		`-=======`
`420`	`418`
`421`	`419`	`@inproceedings{koios_benchmarks,`
`422`	`420`	`title={Koios: A Deep Learning Benchmark Suite for FPGA Architecture and CAD Research},`
`@@ -425,4 +423,3 @@ @inproceedings{koios_benchmarks`
`425`	`423`	`year={2021}`
`426`	`424`	`}`
`427`	`425`
`428`		`->>>>>>> ca872deda... Dummy change to create a new commit for all files to be PR'ed`