Просмотр исходного кода

:pencil2: Fixed merge issues

juan-filtering-match-pool
tomit4 2 лет назад
Родитель
Сommit
537eb836c1
1 измененных файлов: 5 добавлений и 0 удалений
  1. 5
    0
      frontend/src/views/OnboardingView.vue

+ 5
- 0
frontend/src/views/OnboardingView.vue Просмотреть файл

29
             p(v-if='currentStep != 0') You have completed: {{ currentStep }} / {{ survey?.steps?.length }} survey steps
29
             p(v-if='currentStep != 0') You have completed: {{ currentStep }} / {{ survey?.steps?.length }} survey steps
30
 
30
 
31
     article(v-else)
31
     article(v-else)
32
+<<<<<<< HEAD
32
         SurveyCompleteView(:surveySteps='survey.steps' :responses='responses')
33
         SurveyCompleteView(:surveySteps='survey.steps' :responses='responses')
34
+=======
35
+        // TODO: format answers and surveySteps on created based off of existing responses
36
+        SurveyCompleteView(:answers='answered' :surveySteps='survey.steps' :responses='responses')
37
+>>>>>>> f9ccc4c (:memo: Small note on how to proceed with SurveyCompleteView)
33
 </template>
38
 </template>
34
 
39
 
35
 <script>
40
 <script>

Загрузка…
Отмена
Сохранить