Add the term number to one of the mentors

2 years ago · 18115910b4
parent c89697ca0d
commit 18115910b4
1 changed files with 0 additions and 4 deletions
--- a/_data/mentors.yml
+++ b/_data/mentors.yml
@ -122,11 +122,7 @@
  photo: karina_reisel_mentor.jpg
  specialty: Riistvara arendus ja programmeerimine
  teams: ['Turundus', 'Juhatus']
-<<<<<<< HEAD
  term: 2
-=======
-  term: null
->>>>>>> 171a732 (Mentors for 2023 WIP)
  contactMethods:
    - name: Discord
      value: rinsan5781