Skip to content

Commit f34efa8

Browse files
committed
Deleted the merge markers
1 parent bdf2d42 commit f34efa8

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

doc/src/z_references.bib

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -415,8 +415,6 @@ @ARTICLE{murray_micro_symbiflow
415415
number={},
416416
pages={1-1}
417417
}
418-
<<<<<<< HEAD
419-
=======
420418

421419
@inproceedings{koios_benchmarks,
422420
title={Koios: A Deep Learning Benchmark Suite for FPGA Architecture and CAD Research},
@@ -425,4 +423,3 @@ @inproceedings{koios_benchmarks
425423
year={2021}
426424
}
427425

428-
>>>>>>> ca872deda... Dummy change to create a new commit for all files to be PR'ed

0 commit comments

Comments
 (0)