Skip to content

Commit a1859aa

Browse files
committed
[lib][rr_graph] fix merge conflict
1 parent 29bfe3c commit a1859aa

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

libs/librrgraph/src/base/rr_graph_storage.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1017,11 +1017,7 @@ class t_rr_graph_storage {
10171017
* | |
10181018
* starting point ending point
10191019
*/
1020-
<<<<<<< HEAD
10211020
vtr::vector<RRNodeId, std::vector<short>> node_tilable_track_nums_;
1022-
=======
1023-
vtr::vector<RRNodeId, std::vector<short>> node_tilable_track_nums_;
1024-
>>>>>>> 3b9f5526e6ecfe4cf370548812205ffcd2f31db2
10251021

10261022
/** @brief
10271023
* This array stores the first edge of each RRNodeId. Not that the length

0 commit comments

Comments
 (0)