Removing conflicts

Muhammad Haris Zafar · Muhammad Haris Zafar · commit a8e188c8a55f · 2021-09-28T10:20:37.000+05:00
diff --git a/vpr/src/route/rr_node.cpp b/vpr/src/route/rr_node.cpp
@@ -79,10 +79,6 @@ void t_rr_node::set_rc_index(short new_rc_index) {
     storage_->set_node_rc_index(id_, new_rc_index);
 }
 
-void t_rr_node::set_capacity(short new_capacity) {
-    storage_->set_node_capacity(id_, new_capacity);
-}
-
 void t_rr_node::add_side(e_side new_side) {
     storage_->add_node_side(id_, new_side);
 }

Original file line number	Diff line number	Diff line change
`@@ -79,10 +79,6 @@ void t_rr_node::set_rc_index(short new_rc_index) {`
`79`	`79`	`storage_->set_node_rc_index(id_, new_rc_index);`
`80`	`80`	`}`
`81`	`81`
`82`		`-void t_rr_node::set_capacity(short new_capacity) {`
`83`		`- storage_->set_node_capacity(id_, new_capacity);`
`84`		`-}`
`85`		`-`
`86`	`82`	`void t_rr_node::add_side(e_side new_side) {`
`87`	`83`	`storage_->add_node_side(id_, new_side);`
`88`	`84`	`}`