From 880af49c9f4d1906543fb099208eba52663e59fe Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 24 Oct 2023 11:12:54 -0400 Subject: [PATCH] Resolve conflicts --- app/models/forms/export.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/models/forms/export.rb b/app/models/forms/export.rb index fa1f892b09..9a624cd586 100644 --- 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