Commit 6f4f9e1c authored by lintangsutawika's avatar lintangsutawika
Browse files

resolved merge conflict

parents 0d5748b7 aed90773
......@@ -2,4 +2,4 @@ include: ../_sciq_alt_yaml
group: sciq_alt_ov_02
task: sciq_alt_ov_02b
doc_to_text: !function ../styles.template_02
doc_to_choice: !function ../styles.choice_02b
\ No newline at end of file
doc_to_choice: !function ../styles.choice_02b
......@@ -2,4 +2,4 @@ include: ../_sciq_alt_yaml
group: sciq_alt_ov_02
task: sciq_alt_ov_02c
doc_to_text: !function ../styles.template_02
doc_to_choice: !function ../styles.choice_02c
\ No newline at end of file
doc_to_choice: !function ../styles.choice_02c
......@@ -2,4 +2,4 @@ include: ../_sciq_alt_yaml
group: sciq_alt_ov_03
task: sciq_alt_ov_03a
doc_to_text: !function ../styles.template_03
doc_to_choice: !function ../styles.choice_03a
\ No newline at end of file
doc_to_choice: !function ../styles.choice_03a
......@@ -2,4 +2,4 @@ include: ../_sciq_alt_yaml
group: sciq_alt_ov_03
task: sciq_alt_ov_03b
doc_to_text: !function ../styles.template_03
doc_to_choice: !function ../styles.choice_03b
\ No newline at end of file
doc_to_choice: !function ../styles.choice_03b
......@@ -2,4 +2,4 @@ include: ../_sciq_alt_yaml
group: sciq_alt_ov_03
task: sciq_alt_ov_03c
doc_to_text: !function ../styles.template_03
doc_to_choice: !function ../styles.choice_03c
\ No newline at end of file
doc_to_choice: !function ../styles.choice_03c
......@@ -2,4 +2,4 @@ include: ../_sciq_alt_yaml
group: sciq_alt_ov_04
task: sciq_alt_ov_04a
doc_to_text: !function ../styles.template_04
doc_to_choice: !function ../styles.choice_04a
\ No newline at end of file
doc_to_choice: !function ../styles.choice_04a
......@@ -2,4 +2,4 @@ include: ../_sciq_alt_yaml
group: sciq_alt_ov_04
task: sciq_alt_ov_04b
doc_to_text: !function ../styles.template_04
doc_to_choice: !function ../styles.choice_04b
\ No newline at end of file
doc_to_choice: !function ../styles.choice_04b
......@@ -2,4 +2,4 @@ include: ../_sciq_alt_yaml
group: sciq_alt_ov_04
task: sciq_alt_ov_04c
doc_to_text: !function ../styles.template_04
doc_to_choice: !function ../styles.choice_04c
\ No newline at end of file
doc_to_choice: !function ../styles.choice_04c
......@@ -2,4 +2,4 @@ include: ../_sciq_alt_yaml
group: sciq_alt_ov_05
task: sciq_alt_ov_05a
doc_to_text: !function ../styles.template_05
doc_to_choice: !function ../styles.choice_05a
\ No newline at end of file
doc_to_choice: !function ../styles.choice_05a
......@@ -2,4 +2,4 @@ include: ../_sciq_alt_yaml
group: sciq_alt_ov_05
task: sciq_alt_ov_05b
doc_to_text: !function ../styles.template_05
doc_to_choice: !function ../styles.choice_05b
\ No newline at end of file
doc_to_choice: !function ../styles.choice_05b
......@@ -2,4 +2,4 @@ include: ../_sciq_alt_yaml
group: sciq_alt_ov_05
task: sciq_alt_ov_05c
doc_to_text: !function ../styles.template_05
doc_to_choice: !function ../styles.choice_05c
\ No newline at end of file
doc_to_choice: !function ../styles.choice_05c
......@@ -2,4 +2,4 @@ include: ../_sciq_alt_yaml
group: sciq_alt_ov_06
task: sciq_alt_ov_06a
doc_to_text: !function ../styles.template_06
doc_to_choice: !function ../styles.choice_06a
\ No newline at end of file
doc_to_choice: !function ../styles.choice_06a
......@@ -2,4 +2,4 @@ include: ../_sciq_alt_yaml
group: sciq_alt_ov_06
task: sciq_alt_ov_06b
doc_to_text: !function ../styles.template_06
doc_to_choice: !function ../styles.choice_06b
\ No newline at end of file
doc_to_choice: !function ../styles.choice_06b
......@@ -2,4 +2,4 @@ include: ../_sciq_alt_yaml
group: sciq_alt_ov_06
task: sciq_alt_ov_06c
doc_to_text: !function ../styles.template_06
doc_to_choice: !function ../styles.choice_06c
\ No newline at end of file
doc_to_choice: !function ../styles.choice_06c
......@@ -2,4 +2,4 @@ include: ../_sciq_alt_yaml
group: sciq_alt_ov_07
task: sciq_alt_ov_07a
doc_to_text: !function ../styles.template_07
doc_to_choice: !function ../styles.choice_07a
\ No newline at end of file
doc_to_choice: !function ../styles.choice_07a
......@@ -2,4 +2,4 @@ include: ../_sciq_alt_yaml
group: sciq_alt_ov_07
task: sciq_alt_ov_07b
doc_to_text: !function ../styles.template_07
doc_to_choice: !function ../styles.choice_07b
\ No newline at end of file
doc_to_choice: !function ../styles.choice_07b
......@@ -2,4 +2,4 @@ include: ../_sciq_alt_yaml
group: sciq_alt_ov_07
task: sciq_alt_ov_07c
doc_to_text: !function ../styles.template_07
doc_to_choice: !function ../styles.choice_07c
\ No newline at end of file
doc_to_choice: !function ../styles.choice_07c
......@@ -2,4 +2,4 @@ include: ../_sciq_alt_yaml
group: sciq_alt_ov_08
task: sciq_alt_ov_08a
doc_to_text: !function ../styles.template_08
doc_to_choice: !function ../styles.choice_08a
\ No newline at end of file
doc_to_choice: !function ../styles.choice_08a
......@@ -2,4 +2,4 @@ include: ../_sciq_alt_yaml
group: sciq_alt_ov_08
task: sciq_alt_ov_08b
doc_to_text: !function ../styles.template_08
doc_to_choice: !function ../styles.choice_08b
\ No newline at end of file
doc_to_choice: !function ../styles.choice_08b
......@@ -2,4 +2,4 @@ include: ../_sciq_alt_yaml
group: sciq_alt_ov_08
task: sciq_alt_ov_08c
doc_to_text: !function ../styles.template_08
doc_to_choice: !function ../styles.choice_08c
\ No newline at end of file
doc_to_choice: !function ../styles.choice_08c
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment