Resolved merge conflict for Flow/README

Signed-off-by: sakundu <sakundu@ucsd.edu>

Resolved merge conflict for Flow/README
Signed-off-by: sakundu <sakundu@ucsd.edu>
a3b2d53e · sakundu · 9091b465 · a3b2d53e
Commit a3b2d53e authored Jul 08, 2022 by sakundu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

Flows/README.md
+0 -4

No files found.
--- a/Flows/README.md
+++ b/Flows/README.md
@@ -101,8 +101,4 @@ Clone ORFS and build OpenROAD tools following the steps given [here](https://git
  ```
  
 The screenshot of the Ariane 136 testcase using the ORFS (RTL-MP) on NanGate45 enablement is shown below.  
-<<<<<<< HEAD
 <img src="./NanGate45/ariane136/screenshots/Ariane136_ORFS_SPNR.png" alt="ariane136_orfs" width="400"/>
-=======
-<img src="./NanGate45/ariane136/screenshots/Ariane136_ORFS_SPNR.png" alt="ariane136_orfs" width="400"/>
->>>>>>> f203df754b535b476f5d8edf541bc18ca6d902ea