Sfoglia il codice sorgente

:pencil2: fixed typo from rebase

juan-filtering-match-pool
tomit4 2 anni fa
parent
commit
df9e234db8
1 ha cambiato i file con 0 aggiunte e 5 eliminazioni
  1. 0
    5
      frontend/src/views/OnboardingView.vue

+ 0
- 5
frontend/src/views/OnboardingView.vue Vedi File

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
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')
32
         SurveyCompleteView(:answers='answered' :surveySteps='survey.steps' :responses='responses')
37
->>>>>>> f9ccc4c (:memo: Small note on how to proceed with SurveyCompleteView)
38
 </template>
33
 </template>
39
 
34
 
40
 <script>
35
 <script>

Loading…
Annulla
Salva