From 246e6541c8c539e458755d459a7978a131f6e11c Mon Sep 17 00:00:00 2001
From: Alexander Zhirov <alexander@zhirov.website>
Date: Wed, 23 Jun 2021 14:32:29 +0300
Subject: [PATCH] changed the first task

---
 lesson_2/main.cpp | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/lesson_2/main.cpp b/lesson_2/main.cpp
index 4ace2e3..2a8215a 100644
--- a/lesson_2/main.cpp
+++ b/lesson_2/main.cpp
@@ -9,7 +9,6 @@ int Student::count = 0;
 
 int main()
 {
-<<<<<<< HEAD
 	vector<Student> students;
 
 	students.emplace_back("Олег", 20, GENDER_MALE, 75.2, 2020);
@@ -20,21 +19,6 @@ int main()
 	students.emplace_back("Анастасия", 20, GENDER_FEMALE, 55.2, 2020);
 	students.emplace_back("Ольга", 21, GENDER_FEMALE, 49.3, 2020);
 	students.emplace_back("Владимир", 19, GENDER_MALE, 69.9, 2020);
-=======
-	// Exercise 1
-
-	Student students[] =
-	{
-		Student("Олег", 20, GENDER_MALE, 75.2, 2020),
-		Student("Андрей", 19, GENDER_MALE, 72.8, 2020),
-		Student("Анастасия", 20, GENDER_FEMALE, 55.2, 2020),
-		Student("Ольга", 21, GENDER_FEMALE, 49.3, 2020),
-		Student("Владимир", 19, GENDER_MALE, 69.9, 2020)
-	};
-
-	students[0].printInfo();
-	students[2].printInfo();
->>>>>>> e9026cb63dde16cf8340ce3ff1a35ea7d0cc0045
 
 	Student::printCount();