fixed assert problem

Author: WhiteNinjaZ

libs/librrgraph/src/utils/alloc_and_load_rr_indexed_data.cpp

@@ -546,18 +546,13 @@ static void load_rr_indexed_data_T_values(const RRGraphView& rr_graph,
         calculate_average_switch(rr_graph, (size_t)rr_id, avg_switch_R, avg_switch_T, avg_switch_Cinternal, num_switches, num_shorts, buffered, fan_in_list);
 
         if (num_switches == 0) {
-<<<<<<< HEAD
             if (num_shorts == 0) {
                 VTR_LOG_WARN("Node: %d with RR_type: %s  at Location:%s, had no out-going switches\n", rr_id,
                              rr_graph.node_type_string(rr_id), node_cords.c_str());
             }
-=======
-            VTR_LOG_WARN("Node: %d with RR_type: %s  at Location:%s, had no incoming switches\n", rr_id,
-                         rr_graph.node_type_string(rr_id), node_cords.c_str());
->>>>>>> upstream/master
             continue;
-        }    
-        VTR_ASSERT(num_switches > 0);
+        }
+        VTR_ASSERT(num_switches > 0 || num_shorts > 0);
 
         num_nodes_of_index[cost_index]++;
         C_total[cost_index].push_back(rr_graph.node_C(rr_id));