From c89697ca0dc929c06dd57515e50ce822c1f9cf5c Mon Sep 17 00:00:00 2001
From: Andree Uuetoa <andree.uuetoa@gmail.com>
Date: Mon, 11 Sep 2023 23:37:32 +0300
Subject: [PATCH] Mentors for 2023 WIP

---
 _data/mentors.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/_data/mentors.yml b/_data/mentors.yml
index 212ae0f..66057b9 100644
--- a/_data/mentors.yml
+++ b/_data/mentors.yml
@@ -122,7 +122,11 @@
   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