Resolve conflicts

thecartercenter · Oct 24, 2023 · 880af49 · 880af49
1 parent 31bf094
commit 880af49
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/app/models/forms/export.rb b/app/models/forms/export.rb
@@ -122,8 +122,9 @@ def to_xls
             unless os_already_logged
               os.option_nodes.each_with_index do |node, x|
                 if node.option.present?
-                  .row(x + choices_index_mod)
-                  .push(os.name, node.option.canonical_name, node.option.canonical_name)
+                  choices
+                    .row(x + choices_index_mod)
+                    .push(os.name, node.option.canonical_name, node.option.canonical_name)
                 end
               end