Fix accidentally commited merge

app/components/projects/table_component.rb

@@ -64,18 +64,10 @@ def build_sort_header(column, options)
     # We don't return the project row
     # but the [project, level] array from the helper
     def rows
-<<<<<<< HEAD
-      @rows ||=
-        begin
-          projects_enumerator = ->(model) { to_enum(:projects_with_levels_order_sensitive, model).to_a }
-          instance_exec(model, &projects_enumerator)
-        end
-=======
       @rows ||= begin
         projects_enumerator = ->(model) { to_enum(:projects_with_levels_order_sensitive, model).to_a }
         instance_exec(model, &projects_enumerator)
       end
->>>>>>> 0e1a80b408 (Add methods to publish and unpublish a project list based on permission)
     end
 
     def initialize_sorted_model
@@ -126,8 +118,8 @@ def columns
         index = columns.index { |column| column.attribute == :name }
         columns.insert(index, ::Queries::Projects::Selects::Default.new(:hierarchy)) if index
 
-          columns
-        end
+        columns
+      end
     end
 
     def projects(query)