commit 980fa5a3800f18836b47e0ee765235efcb405c2f
author Maciej Kurc <mkurc@antmicro.com> Mon Oct 07 14:39:06 2019 +0200
committer kmurray <kmurray@users.noreply.github.com> Fri Oct 25 16:28:50 2019 -0400
tree f18af7398fc9a467dabe6c6d8d0d4527d34189f3
parent cc4407ec903930dc82ad5f484e7dcdb0d5afae0f

Integration.

Signed-off-by: Maciej Kurc <mkurc@antmicro.com>

utils/fasm/src/fasm.cpp

diff --git a/utils/fasm/src/fasm.cpp b/utils/fasm/src/fasm.cpp
index 0b9844c..03189cf 100644
--- a/utils/fasm/src/fasm.cpp
+++ b/utils/fasm/src/fasm.cpp
@@ -644,13 +644,10 @@
 
 void FasmWriterVisitor::find_clb_prefix(const t_pb_graph_node *node,
         bool *have_prefix, std::string *clb_prefix) const {
-<<<<<<< HEAD
-=======
 
     *have_prefix = false;
     *clb_prefix  = "";
 
->>>>>>> Fixed fasm output for top-level blocks without prefixes.
     while(node != nullptr) {
         auto clb_prefix_itr = clb_prefix_map_.find(node);
         *have_prefix = clb_prefix_itr != clb_prefix_map_.end();
@@ -715,11 +712,7 @@
         // pb_type_prefixes_, not on the mux input.
         if(mux_pb_name == pb_name && mux_port_name == port_name && mux_pin_index == pin_index) {
           if(mux_parts[1] != "NULL") {
-<<<<<<< HEAD
-            output_fasm_features(have_prefix, clb_prefix, fasm_features);
-=======
             output_fasm_features(fasm_features, clb_prefix, blk_prefix_);
->>>>>>> Fixed fasm output for top-level blocks without prefixes.
           }
           return;
         }